[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-383-g06b8c8f

[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  06b8c8f9e8b3686b5fc65eaf414d673deb31cc90 (commit)
       via  4b558b4fcf35d45b0d5996e8e1632b4213554991 (commit)
      from  6dbb030369553f7ad5f0ca7494d54b3cfb92e9ae (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=06b8c8f9e8b3686b5fc65eaf414d673deb31cc90
commit 06b8c8f9e8b3686b5fc65eaf414d673deb31cc90
Merge: 6dbb030 4b558b4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 6 13:00:04 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 6 13:00:04 2014 -0500

    Merge topic 'update-curl' into next
    
    4b558b4f curl: Drop linker flags from librarian invocation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b558b4fcf35d45b0d5996e8e1632b4213554991
commit 4b558b4fcf35d45b0d5996e8e1632b4213554991
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 6 12:58:55 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 6 12:59:31 2014 -0500

    curl: Drop linker flags from librarian invocation
    
    Drop this line of upstream code.  It makes no sense to pass linker
    flags to the librarian for creating a static library.

diff --git a/Utilities/cmcurl/lib/CMakeLists.txt b/Utilities/cmcurl/lib/CMakeLists.txt
index 739d410..48dbe1b 100644
--- a/Utilities/cmcurl/lib/CMakeLists.txt
+++ b/Utilities/cmcurl/lib/CMakeLists.txt
@@ -94,10 +94,6 @@ add_library(
   ${HHEADERS} ${CSOURCES}
   )
 
-if(MSVC AND CURL_STATICLIB)
-  set_target_properties(${LIB_NAME} PROPERTIES STATIC_LIBRARY_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
-endif()
-
 target_link_libraries(${LIB_NAME} ${CURL_LIBS})
 
 if(WIN32)

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

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


hooks/post-receive
-- 
CMake