From 4013fffadf756d7ed39b7d1167faf9e23ffbf4b6 Mon Sep 17 00:00:00 2001 From: Daniel Brunner <0xFEEDC0DE64@gmail.com> Date: Fri, 16 Nov 2018 23:26:31 +0100 Subject: [PATCH] Made project checkout optional --- CMakeLists.txt | 32 +++++++++++++++++++------------- DbWebserver | 2 +- DbZeiterfassung | 2 +- libs/CMakeLists.txt | 6 +++--- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fa33a5b..d1a5c1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,20 +35,26 @@ FUNCTION(PREPEND var prefix) SET(${var} "${listVar}" PARENT_SCOPE) ENDFUNCTION(PREPEND) +FUNCTION(optional_add_subdirectory source_dir) + if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${source_dir}/CMakeLists.txt) + add_subdirectory(${source_dir}) + endif() +ENDFUNCTION(optional_add_subdirectory) + add_subdirectory(3rdparty) -add_subdirectory(DbDatabaseTree) -add_subdirectory(DbHashCracker) -add_subdirectory(DbMessaging) -add_subdirectory(DbNeuralNet) -add_subdirectory(DbPathFinder) -add_subdirectory(DbPicSync) -add_subdirectory(DbRadioDumper) -add_subdirectory(DbSerialServer) -add_subdirectory(DbSketch) -add_subdirectory(DbTernaryClock) -add_subdirectory(DbTictactoe) -add_subdirectory(DbWebserver) -add_subdirectory(DbZeiterfassung) +optional_add_subdirectory(DbDatabaseTree) +optional_add_subdirectory(DbHashCracker) +optional_add_subdirectory(DbMessaging) +optional_add_subdirectory(DbNeuralNet) +optional_add_subdirectory(DbPathFinder) +optional_add_subdirectory(DbPicSync) +optional_add_subdirectory(DbRadioDumper) +optional_add_subdirectory(DbSerialServer) +optional_add_subdirectory(DbSketch) +optional_add_subdirectory(DbTernaryClock) +optional_add_subdirectory(DbTictactoe) +optional_add_subdirectory(DbWebserver) +optional_add_subdirectory(DbZeiterfassung) add_subdirectory(libs) set(QT_TRANSLATIONS diff --git a/DbWebserver b/DbWebserver index e370fe1..dee06fe 160000 --- a/DbWebserver +++ b/DbWebserver @@ -1 +1 @@ -Subproject commit e370fe1eeae1df6b763a8970329bf05cb9632ae0 +Subproject commit dee06fe5fa57af10bd9eb715984922a46cbf4ac4 diff --git a/DbZeiterfassung b/DbZeiterfassung index eb27403..50e0fe4 160000 --- a/DbZeiterfassung +++ b/DbZeiterfassung @@ -1 +1 @@ -Subproject commit eb27403f83c1f7309daf92c7858bc815148661fd +Subproject commit 50e0fe4220a179618b0fa6672848bd1c75cd982f diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt index da4dc6c..7ea8139 100644 --- a/libs/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -1,5 +1,5 @@ add_custom_target(libs) -add_subdirectory(DbCoreLib) -add_subdirectory(DbGuiLib) -add_subdirectory(DbNetworkLib) +optional_add_subdirectory(DbCoreLib) +optional_add_subdirectory(DbGuiLib) +optional_add_subdirectory(DbNetworkLib)