Targets broken by some parts of f7d1c159

CMakeLists.txt

@@ -44,7 +44,7 @@ elseif (WITH_LIBSODIUM)
 
         # On Solaris, libsodium depends on libssp
         if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-            target_link_libraries (zmq-shared ssp)
+            target_link_libraries (libzmq ssp)
         endif ()
         set (ZMQ_USE_LIBSODIUM 1)
         set (ZMQ_HAVE_CURVE 1)
@@ -693,7 +693,7 @@ endforeach ()
 
 if (ZMQ_BUILD_FRAMEWORK)
   add_custom_command (
-    TARGET zmq-shared
+    TARGET libzmq
     POST_BUILD
     COMMAND ${CMAKE_COMMAND}
     ARGS -E make_directory "${CMAKE_LIBRARY_OUTPUT_PATH}/ZeroMQ.framework/Versions/${ZMQ_VERSION}/MacOS"
@@ -729,18 +729,18 @@ option(BUILD_STATIC "Whether or not to build the static archive" ON)
 list(APPEND target_outputs "")
 
 if (BUILD_SHARED)
-  list(APPEND target_outputs "zmq-shared")
+  list(APPEND target_outputs "libzmq")
 endif()
 
 if (BUILD_STATIC)
-  list(APPEND target_outputs "zmq-static")
+  list(APPEND target_outputs "libzmq-static")
 endif()
 
 if (MSVC)
   if (BUILD_SHARED)
-    add_library (zmq-shared SHARED ${sources} ${public_headers} ${html-docs} ${readme-docs} ${CMAKE_CURRENT_BINARY_DIR}/NSIS.template.in)
-    target_link_libraries (zmq-shared ${OPTIONAL_LIBRARIES})
-    set_target_properties (zmq-shared PROPERTIES
+    add_library (libzmq SHARED ${sources} ${public_headers} ${html-docs} ${readme-docs} ${CMAKE_CURRENT_BINARY_DIR}/NSIS.template.in)
+    target_link_libraries (libzmq ${OPTIONAL_LIBRARIES})
+    set_target_properties (libzmq PROPERTIES
       PUBLIC_HEADER "${public_headers}"
       RELEASE_POSTFIX "${MSVC_TOOLSET}-mt-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
       RELWITHDEBINFO_POSTFIX "${MSVC_TOOLSET}-mt-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
@@ -751,8 +751,8 @@ if (MSVC)
   endif()
   
   if (BUILD_STATIC)
-    add_library (zmq-static STATIC ${sources})
-    set_target_properties (zmq-static PROPERTIES
+    add_library (libzmq-static STATIC ${sources})
+    set_target_properties (libzmq-static PROPERTIES
       PUBLIC_HEADER "${public_headers}"
       RELEASE_POSTFIX "${MSVC_TOOLSET}-mt-s-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
       RELWITHDEBINFO_POSTFIX "${MSVC_TOOLSET}-mt-s-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
@@ -762,9 +762,9 @@ if (MSVC)
   endif()
 else ()
   if (BUILD_SHARED)
-    add_library (zmq-shared SHARED ${sources} ${public_headers} ${html-docs} ${readme-docs} ${zmq-pkgconfig})
+    add_library (libzmq SHARED ${sources} ${public_headers} ${html-docs} ${readme-docs} ${zmq-pkgconfig})
     # NOTE: the SOVERSION MUST be the same as the one generated by libtool!
-    set_target_properties (zmq-shared PROPERTIES
+    set_target_properties (libzmq PROPERTIES
                           COMPILE_DEFINITIONS "DLL_EXPORT"
                           PUBLIC_HEADER "${public_headers}"
                           VERSION ${ZMQ_VERSION}
@@ -772,7 +772,7 @@ else ()
                           OUTPUT_NAME "zmq"
                           PREFIX "lib")
     if (ZMQ_BUILD_FRAMEWORK)
-      set_target_properties (zmq-shared PROPERTIES
+      set_target_properties (libzmq PROPERTIES
                             FRAMEWORK TRUE
                             MACOSX_FRAMEWORK_IDENTIFIER "org.zeromq.libzmq"
                             MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${ZMQ_VERSION}
@@ -787,8 +787,8 @@ else ()
   endif()
 
   if (BUILD_STATIC)
-    add_library (zmq-static STATIC ${sources} ${public_headers} ${html-docs} ${readme-docs} ${zmq-pkgconfig})
-    set_target_properties (zmq-static PROPERTIES
+    add_library (libzmq-static STATIC ${sources} ${public_headers} ${html-docs} ${readme-docs} ${zmq-pkgconfig})
+    set_target_properties (libzmq-static PROPERTIES
       PUBLIC_HEADER "${public_headers}"
       COMPILE_DEFINITIONS "ZMQ_STATIC"
       OUTPUT_NAME "zmq"
@@ -806,27 +806,27 @@ foreach (target ${target_outputs})
 endforeach()
 
 if (BUILD_SHARED)
-  target_link_libraries (zmq-shared ${CMAKE_THREAD_LIBS_INIT})
+  target_link_libraries (libzmq ${CMAKE_THREAD_LIBS_INIT})
 
   if (SODIUM_FOUND)
-    target_link_libraries (zmq-shared ${SODIUM_LIBRARIES})
+    target_link_libraries (libzmq ${SODIUM_LIBRARIES})
   endif ()
   if (HAVE_WS2_32)
-    target_link_libraries (zmq-shared ws2_32)
+    target_link_libraries (libzmq ws2_32)
   elseif (HAVE_WS2)
-    target_link_libraries (zmq-shared ws2)
+    target_link_libraries (libzmq ws2)
   endif ()
 
   if (HAVE_RPCRT4)
-    target_link_libraries (zmq-shared rpcrt4)
+    target_link_libraries (libzmq rpcrt4)
   endif ()
 
   if (HAVE_IPHLAPI)
-    target_link_libraries (zmq-shared iphlpapi)
+    target_link_libraries (libzmq iphlpapi)
   endif ()
 
   if (RT_LIBRARY)
-    target_link_libraries (zmq-shared ${RT_LIBRARY})
+    target_link_libraries (libzmq ${RT_LIBRARY})
   endif ()
 endif ()
 
@@ -847,7 +847,7 @@ if (BUILD_SHARED)
   if (WITH_PERF_TOOL)
     foreach (perf-tool ${perf-tools})
       add_executable (${perf-tool} perf/${perf-tool}.cpp)
-      target_link_libraries (${perf-tool} zmq-shared ${OPTIONAL_LIBRARIES})
+      target_link_libraries (${perf-tool} libzmq ${OPTIONAL_LIBRARIES})
 
       if (RT_LIBRARY)
         target_link_libraries (${perf-tool} ${RT_LIBRARY})
@@ -856,7 +856,7 @@ if (BUILD_SHARED)
       if (ZMQ_BUILD_FRAMEWORK)
         # Copy perf-tools binaries into Framework
         add_custom_command (
-          TARGET zmq-shared ${perf-tool}
+          TARGET libzmq ${perf-tool}
           POST_BUILD
           COMMAND ${CMAKE_COMMAND}
           ARGS -E copy "$<TARGET_FILE:${perf-tool}>" "${LIBRARY_OUTPUT_PATH}/ZeroMQ.framework/Versions/${ZMQ_VERSION_STRING}/MacOS/${perf-tool}"
@@ -906,7 +906,7 @@ if (MSVC)
             COMPONENT SDK)
     endif ()
   elseif (BUILD_SHARED)
-    install (TARGETS zmq-shared
+    install (TARGETS libzmq
             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
             PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
             COMPONENT Runtime)

tests/CMakeLists.txt

@@ -138,7 +138,7 @@ if(WIN32)
 endif()
 
 # add library and include dirs for all targets
-link_libraries(zmq-shared ${OPTIONAL_LIBRARIES})
+link_libraries(libzmq ${OPTIONAL_LIBRARIES})
 include_directories("${CMAKE_SOURCE_DIR}/../include")
 
 foreach(test ${tests})