From 51794d91eda59faeadd1190b96a55f922f881b07 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sat, 8 Aug 2020 23:55:24 -0700 Subject: [PATCH] really get the env vars --- depends/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt index 87e9d74bf..f2ccff398 100644 --- a/depends/CMakeLists.txt +++ b/depends/CMakeLists.txt @@ -21,12 +21,12 @@ ide_folder(clsocket "Depends") # assemble environment args to pass on to dependency projects 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 "") - message("${var} = [${${var}}] -- ${currentHelpString}") # uncomment to see the variables being processed - list(APPEND CL_ARGS "-D${var}=${${var}}") - endif() + if(var MATCHES "^CMAKE_" AND NOT var MATCHES "^CMAKE_CACHE" AND NOT var MATCHES "^CMAKE_HOME" AND NOT var MATCHES "^CMAKE_PROJECT") + message("${var} = [${${var}}]") + list(APPEND CL_ARGS "-D${var}=${${var}}") + endif() endforeach() +message("final CL_ARGS = ${CL_ARGS}") set(LIBEXPAT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/libexpat) ExternalProject_Add(libexpat_project