[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-397-g7cda68d

[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  7cda68d1f7df6b144ade0b7b3011c1e6609b462f (commit)
       via  a0e58dce45943b079f3ac10dad91b77ccc7dd3ca (commit)
      from  349e6373ba51ba9280161862e82dcca02d8b5483 (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=7cda68d1f7df6b144ade0b7b3011c1e6609b462f
commit 7cda68d1f7df6b144ade0b7b3011c1e6609b462f
Merge: 349e637 a0e58dc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 6 16:38:09 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 6 16:38:09 2014 -0500

    Merge topic 'update-curl' into next
    
    a0e58dce curl: Fix copy/install of SSL DLLs


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0e58dce45943b079f3ac10dad91b77ccc7dd3ca
commit a0e58dce45943b079f3ac10dad91b77ccc7dd3ca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 6 16:36:43 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 6 16:37:48 2014 -0500

    curl: Fix copy/install of SSL DLLs
    
    Move the custom commands into the directory that actually
    builds the library to run them.

diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 1777fde..072e41a 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -438,30 +438,6 @@ if(CMAKE_USE_OPENSSL)
     if(CURL_CA_BUNDLE)
       add_definitions(-DCURL_CA_BUNDLE="${CURL_CA_BUNDLE}")
     endif()
-
-    # For windows we want to install OPENSSL_LIBRARIES dlls
-    # and also copy them into the build tree so that testing
-    # can find them.
-    if(WIN32)
-      find_file(CMAKE_EAY_DLL NAME libeay32.dll HINTS ${OPENSSL_INCLUDE_DIR}/..)
-      find_file(CMAKE_SSL_DLL NAME ssleay32.dll HINTS ${OPENSSL_INCLUDE_DIR}/..)
-      mark_as_advanced(CMAKE_EAY_DLL CMAKE_SSL_DLL)
-      if(CMAKE_SSL_DLL AND CMAKE_EAY_DLL)
-        set(CMAKE_CURL_SSL_DLLS ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/libeay32.dll
-          ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/ssleay32.dll)
-        add_custom_command(OUTPUT
-          ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/libeay32.dll
-          DEPENDS ${CMAKE_EAY_DLL}
-          COMMAND ${CMAKE_COMMAND} -E copy  ${CMAKE_EAY_DLL}
-          ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/libeay32.dll)
-        add_custom_command(OUTPUT
-          ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/ssleay32.dll
-          DEPENDS ${CMAKE_SSL_DLL}
-          COMMAND ${CMAKE_COMMAND} -E copy  ${CMAKE_SSL_DLL}
-          ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/ssleay32.dll)
-        install(PROGRAMS ${CMAKE_EAY_DLL} ${CMAKE_SSL_DLL} DESTINATION bin)
-      endif()
-    endif()
   endif(OPENSSL_FOUND)
 endif(CMAKE_USE_OPENSSL)
 
diff --git a/Utilities/cmcurl/lib/CMakeLists.txt b/Utilities/cmcurl/lib/CMakeLists.txt
index 73e95be..096f4e8 100644
--- a/Utilities/cmcurl/lib/CMakeLists.txt
+++ b/Utilities/cmcurl/lib/CMakeLists.txt
@@ -90,10 +90,35 @@ else()
   set(CURL_USER_DEFINED_DYNAMIC_OR_STATIC SHARED)
 endif()
 
+# For windows we want to install OPENSSL_LIBRARIES dlls
+# and also copy them into the build tree so that testing
+# can find them.
+if(CMAKE_USE_OPENSSL AND OPENSSL_FOUND AND WIN32)
+  find_file(CMAKE_EAY_DLL NAME libeay32.dll HINTS ${OPENSSL_INCLUDE_DIR}/..)
+  find_file(CMAKE_SSL_DLL NAME ssleay32.dll HINTS ${OPENSSL_INCLUDE_DIR}/..)
+  mark_as_advanced(CMAKE_EAY_DLL CMAKE_SSL_DLL)
+  if(CMAKE_SSL_DLL AND CMAKE_EAY_DLL)
+    set(CMAKE_CURL_SSL_DLLS ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/libeay32.dll
+      ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/ssleay32.dll)
+    add_custom_command(OUTPUT
+      ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/libeay32.dll
+      DEPENDS ${CMAKE_EAY_DLL}
+      COMMAND ${CMAKE_COMMAND} -E copy  ${CMAKE_EAY_DLL}
+      ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/libeay32.dll)
+    add_custom_command(OUTPUT
+      ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/ssleay32.dll
+      DEPENDS ${CMAKE_SSL_DLL}
+      COMMAND ${CMAKE_COMMAND} -E copy  ${CMAKE_SSL_DLL}
+      ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/ssleay32.dll)
+    install(PROGRAMS ${CMAKE_EAY_DLL} ${CMAKE_SSL_DLL} DESTINATION bin)
+  endif()
+endif()
+
 add_library(
   ${LIB_NAME}
   ${CURL_USER_DEFINED_DYNAMIC_OR_STATIC}
   ${HHEADERS} ${CSOURCES}
+  ${CMAKE_CURL_SSL_DLLS}
   )
 
 if(0) # This code not needed for building within CMake.

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

Summary of changes:
 Utilities/cmcurl/CMakeLists.txt     |   24 ------------------------
 Utilities/cmcurl/lib/CMakeLists.txt |   25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
CMake