applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-28 01:45:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

CMake: simplify definitions, distinguish kinds of sources

Browse source
This commit is contained in:
Adriaan de Groot 2017-09-17 06:48:07 -04:00
parent e5b59d472e
commit a266ecb133
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/libcalamares/CMakeLists.txt
View file

@ -1,9 +1,11 @@
project( libcalamares ) project( libcalamares )
add_definitions( ${QT_DEFINITIONS} ) add_definitions(
add_definitions( -DQT_SHARED ) ${QT_DEFINITIONS}
add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS ) -DQT_SHARED
add_definitions( -DDLLEXPORT_PRO ) -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 )
@ -16,12 +18,14 @@ set( libSources
Job.cpp Job.cpp
JobQueue.cpp JobQueue.cpp
ProcessJob.cpp ProcessJob.cpp
)
set( kdsagSources
kdsingleapplicationguard/kdsingleapplicationguard.cpp kdsingleapplicationguard/kdsingleapplicationguard.cpp
kdsingleapplicationguard/kdsharedmemorylocker.cpp kdsingleapplicationguard/kdsharedmemorylocker.cpp
kdsingleapplicationguard/kdtoolsglobal.cpp kdsingleapplicationguard/kdtoolsglobal.cpp
kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp
)
set( utilSources
utils/CalamaresUtils.cpp utils/CalamaresUtils.cpp
utils/CalamaresUtilsSystem.cpp utils/CalamaresUtilsSystem.cpp
utils/Logger.cpp utils/Logger.cpp
@ -32,7 +36,6 @@ set( libSources
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}
) )
@ -73,7 +76,7 @@ if( WITH_PYTHONQT )
endif() endif()
add_library( calamares SHARED ${libSources} ) add_library( calamares SHARED ${libSources} ${kdsagSources} ${utilSources} )
set_target_properties( calamares set_target_properties( calamares
PROPERTIES PROPERTIES
AUTOMOC TRUE AUTOMOC TRUE