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 76dad3f5e66a5574693d7f43eca9b3b26833c284 (commit) via 70242203dace52753891f57bc4ca3a48acce900c (commit) from acc1e1d9662fa132ac1f0f4a5988353dec155a9b (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=76dad3f5e66a5574693d7f43eca9b3b26833c284 commit 76dad3f5e66a5574693d7f43eca9b3b26833c284 Merge: acc1e1d 7024220 Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Nov 6 15:32:14 2014 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Nov 6 15:32:14 2014 -0500 Merge topic 'update-curl' into next 70242203 curl: Drop inclusion of .rc file for our static lib http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70242203dace52753891f57bc4ca3a48acce900c commit 70242203dace52753891f57bc4ca3a48acce900c Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Nov 6 15:31:38 2014 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Nov 6 15:31:38 2014 -0500 curl: Drop inclusion of .rc file for our static lib diff --git a/Utilities/cmcurl/lib/CMakeLists.txt b/Utilities/cmcurl/lib/CMakeLists.txt index 48dbe1b..73e95be 100644 --- a/Utilities/cmcurl/lib/CMakeLists.txt +++ b/Utilities/cmcurl/lib/CMakeLists.txt @@ -13,9 +13,11 @@ list(APPEND HHEADERS ${CURL_BINARY_DIR}/include/curl/curlbuild.h ) +if(0) # This code not needed for building within CMake. if(MSVC) list(APPEND CSOURCES libcurl.rc) endif() +endif() # SET(CSOURCES # # memdebug.c -not used @@ -94,11 +96,19 @@ add_library( ${HHEADERS} ${CSOURCES} ) +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. if(WIN32) add_definitions( -D_USRDLL ) endif() +endif() set_target_properties(${LIB_NAME} PROPERTIES COMPILE_DEFINITIONS BUILDING_LIBCURL) ----------------------------------------------------------------------- Summary of changes: Utilities/cmcurl/lib/CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits