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

[libcalamares] Apply Qt defines consistently

Browse Source 
- Move some definitions that influence Qt compilation
  up to the top-level.
This commit is contained in:
Adriaan de Groot 2020-05-14 01:05:37 +02:00
parent c3c4b79147
commit c90ebb5d82
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -496,7 +496,11 @@ if ( CALAMARES_VERSION_RC EQUAL 0 )
endif() endif()
# enforce using constBegin, constEnd for const-iterators # enforce using constBegin, constEnd for const-iterators
add_definitions( "-DQT_STRICT_ITERATORS" ) add_definitions(
-DQT_STRICT_ITERATORS
-DQT_SHARED
-DQT_SHAREDPOINTER_TRACK_POINTERS
)
# set paths # set paths
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )

7
src/libcalamares/CMakeLists.txt
View File

@ -1,12 +1,7 @@
# libcalamares is the non-GUI part of Calamares, which includes handling # libcalamares is the non-GUI part of Calamares, which includes handling
# translations, configurations, logging, utilities, global storage, and (non-GUI) jobs. # translations, configurations, logging, utilities, global storage, and (non-GUI) jobs.
add_definitions( add_definitions( -DDLLEXPORT_PRO )
${QT_DEFINITIONS}
-DQT_SHARED
-DQT_SHAREDPOINTER_TRACK_POINTERS
-DDLLEXPORT_PRO
)
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresConfig.h.in configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresConfig.h.in
${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h ) ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h )