diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-11 13:14:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-11 13:14:08 (GMT) |
| commit | a86617902d58aa1a29d8d9d4db47a4c37dc37a4c (patch) | |
| tree | 9a0b5d589ed13156ffeaedd439dc18ecd5ae7fe4 /Utilities | |
| parent | 1b809c09ff12928545c0b482f82a88ad38da70a4 (diff) | |
| parent | e8c027bcc014eb2b84b663af9b79a5eefc437973 (diff) | |
| download | CMake-a86617902d58aa1a29d8d9d4db47a4c37dc37a4c.zip CMake-a86617902d58aa1a29d8d9d4db47a4c37dc37a4c.tar.gz CMake-a86617902d58aa1a29d8d9d4db47a4c37dc37a4c.tar.bz2 | |
Merge topic 'cmcurl-include-first'
e8c027bc cmcurl: Include the local curl directories before all others.
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmcurl/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index abf04d8..1b918c9 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -172,6 +172,11 @@ IF(NOT CURL_SPECIAL_LIBZ) CHECK_LIBRARY_EXISTS_CONCAT("z" inflateEnd HAVE_LIBZ) ENDIF(NOT CURL_SPECIAL_LIBZ) +# Include the local directories before any others so that we do not end up +# including system curl's include directory first by mistake. +INCLUDE_DIRECTORIES(${LIBCURL_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${LIBCURL_BINARY_DIR}) + OPTION(CMAKE_USE_OPENSSL "Use OpenSSL code with curl." OFF) MARK_AS_ADVANCED(CMAKE_USE_OPENSSL) IF(CMAKE_USE_OPENSSL) @@ -679,8 +684,6 @@ INCLUDE(CMake/OtherTests.cmake) # The rest of the build -INCLUDE_DIRECTORIES(${LIBCURL_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${LIBCURL_BINARY_DIR}) OPTION(CMAKE_BUILD_CURL_SHARED "Should curl be built shared" TRUE) IF(CMAKE_BUILD_CURL_SHARED) SET(LIBRARY_TYPE SHARED) |