Commit b4d6b994 authored by Akhil Kedia's avatar Akhil Kedia Committed by Daniel Stenberg
Browse files

cmake: fix build on Ubuntu 14.04 



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: default avatarAkhil <akhil.kedia@samsung.com>
parent a1b3a95c

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ elseif(CURL_CA_PATH_AUTODETECT OR CURL_CA_BUNDLE_AUTODETECT) 
            if(EXISTS "${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_SET TRUE CACHE)

                set(CURL_CA_BUNDLE_SET TRUE CACHE BOOL "Path to the CA bundle has been set")

                break()

            endif()

        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(EXISTS "/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()

lib/curl_config.h.cmake

+2 −2
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ 
#cmakedefine BUILDING_LIBCURL 1



/* 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 */

#cmakedefine CURL_CA_FALLBACK 1



/* Location of default ca path */

#cmakedefine CURL_CA_PATH ${CURL_CA_PATH}

#cmakedefine CURL_CA_PATH "${CURL_CA_PATH}"



/* to disable cookies support */

#cmakedefine CURL_DISABLE_COOKIES 1