[libcalamares] Don't link with PythonQt
- PythonQt is only needed (and used) from the GUI library.
This commit is contained in:
parent
71a719d731
commit
3e011d1419
5
CHANGES
5
CHANGES
@ -9,6 +9,10 @@ This release contains contributions from (alphabetically by first name):
|
|||||||
|
|
||||||
## Core ##
|
## Core ##
|
||||||
|
|
||||||
|
- *libcalamares* (accidentally) linked with Qt's GUI libraries when
|
||||||
|
PythonQt was found. This led to the odd situation where the non-GUI
|
||||||
|
Calamares library depends on a bunch of GUI libraries.
|
||||||
|
|
||||||
## Modules ##
|
## Modules ##
|
||||||
|
|
||||||
- All Python modules now bail out gracefully on (at least some) bad
|
- All Python modules now bail out gracefully on (at least some) bad
|
||||||
@ -16,6 +20,7 @@ This release contains contributions from (alphabetically by first name):
|
|||||||
scripts now test for exceptions to avoid shipping modules with
|
scripts now test for exceptions to avoid shipping modules with
|
||||||
ImportError or SyntaxError results.
|
ImportError or SyntaxError results.
|
||||||
|
|
||||||
|
|
||||||
# 3.2.7 (2019-04-27) #
|
# 3.2.7 (2019-04-27) #
|
||||||
|
|
||||||
This is a **hotfix** release for regressions introduced in the
|
This is a **hotfix** release for regressions introduced in the
|
||||||
|
@ -67,21 +67,6 @@ if( WITH_PYTHON )
|
|||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if( WITH_PYTHONQT )
|
|
||||||
include_directories(${PYTHON_INCLUDE_DIRS})
|
|
||||||
link_directories(${PYTHON_LIBRARIES})
|
|
||||||
|
|
||||||
include_directories(${PYTHONQT_INCLUDE_DIR})
|
|
||||||
link_directories(${PYTHONQT_LIBRARY})
|
|
||||||
|
|
||||||
set( OPTIONAL_PRIVATE_LIBRARIES
|
|
||||||
${OPTIONAL_PRIVATE_LIBRARIES}
|
|
||||||
${PYTHON_LIBRARIES}
|
|
||||||
${PYTHONQT_LIBRARY}
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
|
|
||||||
add_library( calamares SHARED ${libSources} ${kdsagSources} ${utilsSources} )
|
add_library( calamares SHARED ${libSources} ${kdsagSources} ${utilsSources} )
|
||||||
set_target_properties( calamares
|
set_target_properties( calamares
|
||||||
PROPERTIES
|
PROPERTIES
|
||||||
|
Loading…
Reference in New Issue
Block a user