CMakeLists: Migrate off separate variables for source files where applicable

We can append the sources to the target with target_sources() instead.
This commit is contained in:
Lioncash 2019-08-25 18:04:47 -04:00
parent 771abb3390
commit 07b4f02d1d
1 changed files with 22 additions and 14 deletions

View File

@ -4,21 +4,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
find_package(Qt5 COMPONENTS LinguistTools Network Qml Svg Widgets Xml REQUIRED) find_package(Qt5 COMPONENTS LinguistTools Network Qml Svg Widgets Xml REQUIRED)
if(WIN32)
list(APPEND PLAT_SRCS platforms/win/amuse-gui.rc platforms/win/amuse-gui.manifest)
elseif(APPLE)
list(APPEND PLAT_SRCS platforms/mac/mainicon.icns MacOSExtras.mm)
set_source_files_properties(platforms/mac/mainicon.icns PROPERTIES
MACOSX_PACKAGE_LOCATION Resources)
endif()
add_subdirectory(platforms/freedesktop)
declare_qticon_target()
list(APPEND PLAT_SRCS mainicon_qt.cpp)
configure_file(resources/translation_res.qrc translation_res.qrc @ONLY) configure_file(resources/translation_res.qrc translation_res.qrc @ONLY)
set(TRANSLATIONS set(TRANSLATIONS
resources/lang_de.ts) resources/lang_de.ts
)
QT5_CREATE_TRANSLATION(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../lib ${TRANSLATIONS}) QT5_CREATE_TRANSLATION(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../lib ${TRANSLATIONS})
QT5_ADD_RESOURCES(qrc_resources.cpp resources/resources.qrc) QT5_ADD_RESOURCES(qrc_resources.cpp resources/resources.qrc)
@ -89,9 +78,28 @@ add_executable(amuse-gui WIN32 MACOSX_BUNDLE
${AMUSE_MOC} ${AMUSE_MOC}
${MAIN_WINDOW_UI} ${MAIN_WINDOW_UI}
${PLAT_SRCS}
${QM_FILES} ${QM_FILES}
) )
if(WIN32)
target_sources(amuse-gui PRIVATE
platforms/win/amuse-gui.rc
platforms/win/amuse-gui.manifest
)
elseif(APPLE)
target_sources(amuse-gui PRIVATE
MacOSExtras.mm
platforms/mac/mainicon.icns
)
set_source_files_properties(platforms/mac/mainicon.icns PROPERTIES
MACOSX_PACKAGE_LOCATION Resources
)
endif()
add_subdirectory(platforms/freedesktop)
declare_qticon_target()
target_sources(amuse-gui PRIVATE mainicon_qt.cpp)
if(COMMAND add_sanitizers) if(COMMAND add_sanitizers)
add_sanitizers(amuse-gui) add_sanitizers(amuse-gui)
endif() endif()