napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamaresui] don't over-complicate PythonQt library linking

Browse Source
This commit is contained in:
Adriaan de Groot 2019-05-20 13:21:39 +02:00
parent 0c4d77541f
commit a9f3b4050c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libcalamaresui/CMakeLists.txt
View File

@ -64,8 +64,7 @@ if( WITH_PYTHONQT )
viewpages/PythonQtGlobalStorageWrapper.cpp viewpages/PythonQtGlobalStorageWrapper.cpp
viewpages/PythonQtUtilsWrapper.cpp viewpages/PythonQtUtilsWrapper.cpp
) )
set( OPTIONAL_PRIVATE_LIBRARIES set( OPTIONAL_PYTHON_LIBRARIES
${OPTIONAL_PRIVATE_LIBRARIES}
${PYTHON_LIBRARIES} ${PYTHON_LIBRARIES}
${PYTHONQT_LIBRARIES} ${PYTHONQT_LIBRARIES}
) )
@ -76,7 +75,7 @@ calamares_add_library( calamaresui
UI ${calamaresui_UI} UI ${calamaresui_UI}
EXPORT_MACRO UIDLLEXPORT_PRO EXPORT_MACRO UIDLLEXPORT_PRO
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
${OPTIONAL_PRIVATE_LIBRARIES} ${OPTIONAL_PYTHON_LIBRARIES}
LINK_LIBRARIES LINK_LIBRARIES
Qt5::Svg Qt5::Svg
Qt5::QuickWidgets Qt5::QuickWidgets