diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8bd626117165dbf8d07c7b744a62d755e4f434a7..14ffb91cba08f3a681f326b4b151e9bd079a7510 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,7 @@ micromamba: script: - sh <(curl -L micro.mamba.pm/install.sh) - source ~/.bashrc + - micromamba --version - micromamba create -f prerequisites.yml -n DAS -y - micromamba activate DAS - ./install.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index f4ce72ce584bc35f0227a2d645e837428f4272e4..6374f9f62afe76841e8b3a7bcd256c135fd4942b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,15 @@ set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING # Import vendored CMake modules list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") +# taken from https://stackoverflow.com/a/48555098 +get_cmake_property(vars CACHE_VARIABLES) +foreach(var ${vars}) + get_property(currentHelpString CACHE "${var}" PROPERTY HELPSTRING) + if("${currentHelpString}" MATCHES "No help, variable specified on the command line." OR "${currentHelpString}" STREQUAL "") + list(APPEND CL_ARGS "-D${var}=${${var}}") + endif() +endforeach() + project(Installer VERSION 1.0 LANGUAGES C) # Need a language for GNUInstallDirs find_package(Git REQUIRED) @@ -96,4 +105,5 @@ ExternalProject_Add(Core DEPENDS ${TUNFOLD_DEPENDENCY} Darwin BINARY_DIR "${CMAKE_SOURCE_DIR}/Core.build" INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" + CMAKE_ARGS ${CL_ARGS} )