[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-460-g98bdf4a

[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  98bdf4a06ab89ef5d992827f7493902eee38819d (commit)
       via  8b8211a2f7efd0b8c96b7c44cf99d4d11ad1f8d7 (commit)
      from  a164662de75029eabb903dde17bb9ce54e367c9f (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=98bdf4a06ab89ef5d992827f7493902eee38819d
commit 98bdf4a06ab89ef5d992827f7493902eee38819d
Merge: a164662 8b8211a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 10 10:20:00 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 10 10:20:00 2014 -0500

    Merge topic 'update-curl' into next
    
    8b8211a2 curl: Simplify CMake-specific configuration of curl lib


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b8211a2f7efd0b8c96b7c44cf99d4d11ad1f8d7
commit 8b8211a2f7efd0b8c96b7c44cf99d4d11ad1f8d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 10 10:16:41 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 10 10:17:25 2014 -0500

    curl: Simplify CMake-specific configuration of curl lib

diff --git a/Utilities/cmcurl/lib/CMakeLists.txt b/Utilities/cmcurl/lib/CMakeLists.txt
index 096f4e8..a4621c1 100644
--- a/Utilities/cmcurl/lib/CMakeLists.txt
+++ b/Utilities/cmcurl/lib/CMakeLists.txt
@@ -13,11 +13,9 @@ list(APPEND HHEADERS
   ${CURL_BINARY_DIR}/include/curl/curlbuild.h
   )
 
-if(0) # This code not needed for building within CMake.
-if(MSVC)
+if(MSVC AND NOT CURL_STATICLIB)
   list(APPEND CSOURCES libcurl.rc)
 endif()
-endif()
 
 # SET(CSOURCES
 # #  memdebug.c -not used
@@ -121,12 +119,6 @@ add_library(
   ${CMAKE_CURL_SSL_DLLS}
   )
 
-if(0) # This code not needed for building within CMake.
-if(MSVC AND CURL_STATICLIB)
-  set_target_properties(${LIB_NAME} PROPERTIES STATIC_LIBRARY_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
-endif()
-endif()
-
 target_link_libraries(${LIB_NAME} ${CURL_LIBS})
 
 if(0) # This code not needed for building within CMake.

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

Summary of changes:
 Utilities/cmcurl/lib/CMakeLists.txt |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)


hooks/post-receive
-- 
CMake