[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-443-ge660fb0

[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  e660fb035c9764bcf315673e12ee088ada44e16a (commit)
       via  7b07b100947bbf3d30edd4b7d5b3e3a9bc7fd6a0 (commit)
       via  4fc9c22fc8ba945ab16610d269710f412cb124e2 (commit)
      from  e9d45cf5bc5553bfc839600d310f9672b1830866 (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=e660fb035c9764bcf315673e12ee088ada44e16a
commit e660fb035c9764bcf315673e12ee088ada44e16a
Merge: e9d45cf 7b07b10
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 8 06:21:37 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 8 06:21:37 2014 -0500

    Merge topic 'update-curl' into next
    
    7b07b100 curl: Simplify our LIBCURL test addition
    4fc9c22f curl: Do not use 'dl' on HP-UX


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b07b100947bbf3d30edd4b7d5b3e3a9bc7fd6a0
commit 7b07b100947bbf3d30edd4b7d5b3e3a9bc7fd6a0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 8 06:19:23 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Nov 8 06:20:01 2014 -0500

    curl: Simplify our LIBCURL test addition

diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 4e63bf9..278cfb0 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -992,7 +992,7 @@ endif()
 #-----------------------------------------------------------------------------
 # CMake-specific curl code.
 add_executable(LIBCURL curltest.c)
-target_link_libraries(LIBCURL cmcurl ${CMAKE_DL_LIBS})
+target_link_libraries(LIBCURL cmcurl)
 
 if(CMAKE_CURL_TEST_URL)
   add_test(curl LIBCURL ${CMAKE_CURL_TEST_URL})

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4fc9c22fc8ba945ab16610d269710f412cb124e2
commit 4fc9c22fc8ba945ab16610d269710f412cb124e2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 8 06:18:16 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Nov 8 06:20:00 2014 -0500

    curl: Do not use 'dl' on HP-UX
    
    Re-apply the logic change made by commit v2.8.0~1427 (fix warning on
    HPUX, 2008-11-26).

diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index ef8edd6..4e63bf9 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -254,7 +254,13 @@ if(WIN32)
 endif(WIN32)
 
 # Check for all needed libraries
+if(0) # This code not needed for building within CMake.
 check_library_exists_concat("dl"     dlopen       HAVE_LIBDL)
+else()
+  # Use the cmake-defined dl libs as dl is should not be used
+  # on HPUX, but rather dld this avoids a warning
+  list(APPEND CURL_LIBS ${CMAKE_DL_LIBS})
+endif()
 check_library_exists_concat("socket" connect      HAVE_LIBSOCKET)
 check_library_exists("c" gethostbyname "" NOT_NEED_LIBNSL)
 

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

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


hooks/post-receive
-- 
CMake