From 2ab2cb6028d5a19fbd871a07353745ad6f41c0c8 Mon Sep 17 00:00:00 2001 From: Sergei Nikulov Date: Fri, 10 Jan 2014 10:47:33 +0400 Subject: [PATCH 1/3] cmake: fixed error 'install TARGETS given no ARCHIVE DESTINATION for static library target' --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c7418d15..8e5f7f6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -653,6 +653,7 @@ if(MSVC) if(CMAKE_BUILD_TYPE STREQUAL "Debug") install(TARGETS libzmq libzmq-static RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include COMPONENT SDK) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lib/libzmq${_zmq_COMPILER}-mt-gd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}.pdb DESTINATION lib From 44588ab730ff23490cf318d199b0843a97718a2b Mon Sep 17 00:00:00 2001 From: Richard Newton Date: Sat, 19 Sep 2015 14:39:18 +0100 Subject: [PATCH 2/3] Update cmake to support Visual Studio 2015 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e5f7f6f..5cf630e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,10 +46,10 @@ check_include_files(windows.h ZMQ_HAVE_WINDOWS) check_include_files(sys/uio.h ZMQ_HAVE_UIO) check_include_files(sys/eventfd.h ZMQ_HAVE_EVENTFD) -check_library_exists(ws2_32 printf "" HAVE_WS2_32) # TODO: Why doesn't something logical like WSAStartup work? -check_library_exists(ws2 printf "" HAVE_WS2) -check_library_exists(rpcrt4 printf "" HAVE_RPCRT4) # UuidCreateSequential -check_library_exists(iphlpapi printf "" HAVE_IPHLAPI) # GetAdaptersAddresses +check_library_exists(ws2_32 fopen "" HAVE_WS2_32) # TODO: Why doesn't something logical like WSAStartup work? +check_library_exists(ws2 fopen "" HAVE_WS2) +check_library_exists(rpcrt4 fopen "" HAVE_RPCRT4) # UuidCreateSequential +check_library_exists(iphlpapi fopen "" HAVE_IPHLAPI) # GetAdaptersAddresses find_library(RT_LIBRARY rt) From c421799fb2bfb5799b543835259a1705ef98e35f Mon Sep 17 00:00:00 2001 From: Julien Waechter Date: Thu, 4 Feb 2016 01:00:15 +0100 Subject: [PATCH 3/3] Fixed build with CMake >=3.4.x Since CMake 3.4.x, in set_target_properties macro, COMPILE_FLAGS with space generate errors (version.rc.res is not generated) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5cf630e7..aa40e18a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -500,7 +500,7 @@ if(MSVC) PUBLIC_HEADER "${public_headers}" RELEASE_POSTFIX "${_zmq_COMPILER}-mt-s-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}" DEBUG_POSTFIX "${_zmq_COMPILER}-mt-sgd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}" - COMPILE_FLAGS "/D ZMQ_STATIC" + COMPILE_FLAGS "/DZMQ_STATIC" OUTPUT_NAME "libzmq-static") else() add_library(libzmq SHARED ${sources} ${public_headers} ${html-docs} ${readme-docs} ${zmq-pkgconfig})