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

[calamares] Remove cruft from CMakeLists.txt

Browse Source
This commit is contained in:
Adriaan de Groot 2020-03-12 04:40:17 +01:00
parent 32ebb08788
commit cc3b0b2859
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/calamares/CMakeLists.txt
View File

@ -11,22 +11,18 @@ set( calamaresSources
)
include_directories(
.
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../libcalamares
${CMAKE_SOURCE_DIR}/src/libcalamares
${CMAKE_SOURCE_DIR}/src//libcalamaresui
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src/libcalamaresui
${CMAKE_BINARY_DIR}/src/libcalamares
${CMAKE_CURRENT_SOURCE_DIR}
)
# Translations
include( CalamaresAddTranslations )
add_calamares_translations( ${CALAMARES_TRANSLATION_LANGUAGES} )
set( final_src ${calamaresSources} ${calamaresRc} ${trans_outfile} )
add_executable( calamares_bin ${final_src} )
add_executable( calamares_bin ${calamaresSources} ${calamaresRc} ${trans_outfile} )
target_include_directories( calamares_bin PRIVATE ${CMAKE_SOURCE_DIR} )
set_target_properties(calamares_bin
PROPERTIES
ENABLE_EXPORTS TRUE
@ -37,7 +33,7 @@ calamares_autouic( calamares_bin )
target_link_libraries( calamares_bin
PRIVATE
${CALAMARES_LIBRARIES}
calamares
calamaresui
Qt5::Core
Qt5::Widgets
@ -63,6 +59,6 @@ install( FILES ${CMAKE_SOURCE_DIR}/data/images/squid.svg
if( BUILD_TESTING )
add_executable( loadmodule testmain.cpp )
target_link_libraries( loadmodule ${CALAMARES_LIBRARIES} Qt5::Core Qt5::Widgets calamaresui )
target_link_libraries( loadmodule PRIVATE Qt5::Core Qt5::Widgets calamares calamaresui )
# Don't install, it's just for enable_testing
endif()