Hopefully fix passing of CMAKE_BUILD_TYPE down to subprojects

boxbackup · Oct 24, 2018 · 9a9ee26 · 9a9ee26
1 parent d73dc0e
commit 9a9ee26
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -97,13 +97,13 @@ before_build:
   - echo cmake -G "%generator_name%" %cmake_toolset_args% %cmake_toolset_args_2%
     %generator_args%
     -DBOXBACKUP_VERSION=%compiled_version%
-    -DSUB_CMAKE_EXTRA_ARGS="-DCMAKE_BUILD_TYPE:STRING=%CONFIGURATION% -- /verbosity:minimal"
+    -DSUB_CMAKE_EXTRA_ARGS="-- /verbosity:minimal"
     -DPLATFORM=%sane_platform%
     %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\windows
   - cmake -G "%generator_name%" %cmake_toolset_args% %cmake_toolset_args_2%
     %generator_args%
     -DBOXBACKUP_VERSION=%compiled_version%
-    -DSUB_CMAKE_EXTRA_ARGS="-DCMAKE_BUILD_TYPE:STRING=%CONFIGURATION% -- /verbosity:minimal"
+    -DSUB_CMAKE_EXTRA_ARGS="-- /verbosity:minimal"
     -DPLATFORM=%sane_platform%
     %APPVEYOR_BUILD_FOLDER%\infrastructure\cmake\windows
 

diff --git a/infrastructure/cmake/windows/CMakeLists.txt b/infrastructure/cmake/windows/CMakeLists.txt
@@ -117,7 +117,10 @@ else()
 		URL "http://zlib.net/zlib-${ZLIB_VERSION}.tar.gz"
 		URL_HASH ${ZLIB_HASH}
 		DOWNLOAD_NO_PROGRESS 1
-		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${zlib_install_dir} ${SUB_CMAKE_EXTRA_ARGS}
+		CMAKE_ARGS 
+			-DCMAKE_INSTALL_PREFIX=${zlib_install_dir}
+			-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+			${SUB_CMAKE_EXTRA_ARGS}
 		${zlib_install_command}
 		STEP_TARGETS configure build install
 	)
@@ -210,12 +213,15 @@ else()
 		URL "https://ftp.pcre.org/pub/pcre/pcre-${PCRE_VERSION}.tar.bz2"
 		URL_HASH ${PCRE_HASH}
 		DOWNLOAD_NO_PROGRESS 1
-		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${pcre_install_dir} ${SUB_CMAKE_EXTRA_ARGS}
-		-DPCRE_SUPPORT_LIBREADLINE=OFF
-		-DPCRE_SUPPORT_LIBBZ2=OFF
-		-DPCRE_BUILD_PCRECPP=OFF
-		-DPCRE_BUILD_PCREGREP=OFF
-		-DPCRE_BUILD_TESTS=OFF
+		CMAKE_ARGS
+			-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+			-DCMAKE_INSTALL_PREFIX=${pcre_install_dir}
+			-DPCRE_SUPPORT_LIBREADLINE=OFF
+			-DPCRE_SUPPORT_LIBBZ2=OFF
+			-DPCRE_BUILD_PCRECPP=OFF
+			-DPCRE_BUILD_PCREGREP=OFF
+			-DPCRE_BUILD_TESTS=OFF
+			${SUB_CMAKE_EXTRA_ARGS}
 		${pcre_install_command}
 	)
 
@@ -251,6 +257,7 @@ ExternalProject_Add(boxbackup
 		-DCMAKE_INSTALL_PREFIX=${install_dir}
 		-DAPPVEYOR_MODE=1
 		-DDEBUG=${DEBUG}
+		-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 		${boxbackup_cmake_args}
 		${SUB_CMAKE_EXTRA_ARGS}
 	INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "No install step needed"