From 324d13b25de48943459ad39e805b6e1dd41cfe2c Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Sun, 21 Aug 2022 06:05:50 +0400 Subject: Build: Move `CURL_CA_BUNDLE` and `CURL_CA_PATH` to config header --- Source/CMakeLists.txt | 6 ------ Source/cmConfigure.cmake.h.in | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 1901f68..aa74ed5 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -902,12 +902,6 @@ if(WIN32 AND NOT CYGWIN) target_link_libraries(cmcldeps PRIVATE CMakeLib) endif() -foreach(v IN ITEMS CURL_CA_BUNDLE CURL_CA_PATH) - if(${v}) - set_property(SOURCE cmCurl.cxx APPEND PROPERTY COMPILE_DEFINITIONS ${v}="${${v}}") - endif() -endforeach() - foreach(check IN ITEMS STAT_HAS_ST_MTIM STAT_HAS_ST_MTIMESPEC) if(KWSYS_CXX_${check}_COMPILED) # abuse KWSys check cache entry set(CMake_${check} 1) diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in index ea7569f..398b493 100644 --- a/Source/cmConfigure.cmake.h.in +++ b/Source/cmConfigure.cmake.h.in @@ -33,3 +33,6 @@ #if defined(_WIN32) && !defined(NOMINMAX) # define NOMINMAX #endif + +#cmakedefine CURL_CA_BUNDLE "@CURL_CA_BUNDLE@" +#cmakedefine CURL_CA_PATH "@CURL_CA_PATH@" -- cgit v0.12