[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-788-g78eec9c

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  78eec9c5ab388ef7cc7a6ccf1fa9db55de314b1f (commit)
       via  e8c027bcc014eb2b84b663af9b79a5eefc437973 (commit)
      from  b7a0a7dd64c92f4e970465ab282503dde473025d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78eec9c5ab388ef7cc7a6ccf1fa9db55de314b1f
commit 78eec9c5ab388ef7cc7a6ccf1fa9db55de314b1f
Merge: b7a0a7d e8c027b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 10 11:40:25 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 10 11:40:25 2014 -0400

    Merge topic 'cmcurl-include-first' into next
    
    e8c027bc cmcurl: Include the local curl directories before all others.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8c027bcc014eb2b84b663af9b79a5eefc437973
commit e8c027bcc014eb2b84b663af9b79a5eefc437973
Author:     Raphael Kubo da Costa <rakuco at FreeBSD.org>
AuthorDate: Sun Mar 9 16:16:39 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 10 11:40:12 2014 -0400

    cmcurl: Include the local curl directories before all others.
    
    In some cases, it was possible for the include directory of the system-wide
    libcurl to be added to the include path before cmcurl's, which would result
    in them being picked up and causing the build to fail if the curl versions
    differ too much.
    
    One way to trigger this is to have OpenSSL installed into a non-default
    location together with libcurl (/usr/local, for example). If cmcurl is built
    with CMAKE_USE_OPENSSL on, -I/usr/local/include would end up being added
    before -I${PATH_TO_CMCURL}.

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)

-----------------------------------------------------------------------

Summary of changes:
 Utilities/cmcurl/CMakeLists.txt |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake