moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

cmake: fix build on Ubuntu 14.04

Browse Source 
Fixed a syntax error with setting cache variables (The type and
docstring were missing), resulting in build errors.  Quoted the
CURL_CA_PATH and CURL_CA_BUNDLE otherwise the path was written without
quotes in C code, resulting in build errors.

Closes #1503

Signed-off-by: Akhil <akhil.kedia@samsung.com>
This commit is contained in:
Akhil Kedia 2017-05-22 17:34:45 +09:00 committed by Daniel Stenberg
parent a1b3a95c96
commit b4d6b99445
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -674,7 +674,7 @@ elseif(CURL_CA_PATH_AUTODETECT OR CURL_CA_BUNDLE_AUTODETECT)
if(EXISTS "${SEARCH_CA_BUNDLE_PATH}") if(EXISTS "${SEARCH_CA_BUNDLE_PATH}")
message(STATUS "Found CA bundle: ${SEARCH_CA_BUNDLE_PATH}") message(STATUS "Found CA bundle: ${SEARCH_CA_BUNDLE_PATH}")
set(CURL_CA_BUNDLE "${SEARCH_CA_BUNDLE_PATH}") set(CURL_CA_BUNDLE "${SEARCH_CA_BUNDLE_PATH}")
set(CURL_CA_BUNDLE_SET TRUE CACHE) set(CURL_CA_BUNDLE_SET TRUE CACHE BOOL "Path to the CA bundle has been set")
break() break()
endif() endif()
endforeach() endforeach()
@ -683,7 +683,7 @@ elseif(CURL_CA_PATH_AUTODETECT OR CURL_CA_BUNDLE_AUTODETECT)
if(CURL_CA_PATH_AUTODETECT AND (NOT CURL_CA_PATH_SET)) if(CURL_CA_PATH_AUTODETECT AND (NOT CURL_CA_PATH_SET))
if(EXISTS "/etc/ssl/certs") if(EXISTS "/etc/ssl/certs")
set(CURL_CA_PATH "/etc/ssl/certs") set(CURL_CA_PATH "/etc/ssl/certs")
set(CURL_CA_PATH_SET TRUE CACHE) set(CURL_CA_PATH_SET TRUE CACHE BOOL "Path to the CA bundle has been set")
endif() endif()
endif() endif()
endif() endif()

4
lib/curl_config.h.cmake
View File

@ -4,13 +4,13 @@
#cmakedefine BUILDING_LIBCURL 1 #cmakedefine BUILDING_LIBCURL 1
/* Location of default ca bundle */ /* Location of default ca bundle */
#cmakedefine CURL_CA_BUNDLE ${CURL_CA_BUNDLE} #cmakedefine CURL_CA_BUNDLE "${CURL_CA_BUNDLE}"
/* define "1" to use built-in ca store of TLS backend */ /* define "1" to use built-in ca store of TLS backend */
#cmakedefine CURL_CA_FALLBACK 1 #cmakedefine CURL_CA_FALLBACK 1
/* Location of default ca path */ /* Location of default ca path */
#cmakedefine CURL_CA_PATH ${CURL_CA_PATH} #cmakedefine CURL_CA_PATH "${CURL_CA_PATH}"
/* to disable cookies support */ /* to disable cookies support */
#cmakedefine CURL_DISABLE_COOKIES 1 #cmakedefine CURL_DISABLE_COOKIES 1