Merge pull request #1350 from zeromq/revert-1345-bzimmerman_CMAKE

Revert "Bzimmerman cmake"

CMakeLists.txt

@@ -5,6 +5,10 @@ project(ZeroMQ)
 
 option(WITH_OPENPGM "Build with support for OpenPGM" OFF)
 
+if(APPLE)
+  option(ZMQ_BUILD_FRAMEWORK "Build as OS X framework" ON)
+endif()
+
 if(WIN32)
 option(WITH_TWEETNACL "Build with tweetnacl" OFF)
 else()
@@ -99,6 +103,8 @@ list(APPEND CMAKE_MODULE_PATH ${ZMQ_CMAKE_MODULES_DIR})
 
 include(TestZMQVersion)
 include(ZMQSourceRunChecks)
+include(CheckIncludeFiles)
+include(CheckLibraryExists)
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
 include(CheckCSourceCompiles)
@@ -106,62 +112,22 @@ include(CheckCSourceRuns)
 include(CMakeDependentOption)
 include(CheckCXXSymbolExists)
 
-# MACRO to find include file
+check_include_files(ifaddrs.h ZMQ_HAVE_IFADDRS)
-macro(zmq_find_include include_name var_result)
+check_include_files(windows.h ZMQ_HAVE_WINDOWS)
-    message(STATUS "Looking for header ${include_name}")
+check_include_files(sys/uio.h ZMQ_HAVE_UIO)
-    find_file(file_result NAMES "${include_name}" )
+check_include_files(sys/eventfd.h ZMQ_HAVE_EVENTFD)
-#    message(STATUS "Find File result - ${file_result}")    
-    string(FIND "${file_result}" "NOTFOUND" pos)
-    if (pos EQUAL -1)
-        #found include file
-        message(STATUS "Looking for header ${include_name} - found")
-        set("${var_result}" "${file_result}")
-    else()
-        # did not find include
-        message(STATUS "Looking for header ${include_name} - not found")
-        set("${var_result}" "")
-    endif()
-    #clear the find result
-    unset(file_result CACHE)
-endmacro()
 
-# MACRO to find a library
+check_library_exists(ws2_32 printf "" HAVE_WS2_32) # TODO: Why doesn't something logical like WSAStartup work?
-macro(zmq_find_library library_name var_result)
+check_library_exists(ws2 printf "" HAVE_WS2)
-    message(STATUS "Looking for library ${library_name}")
+check_library_exists(rpcrt4 printf "" HAVE_RPCRT4) # UuidCreateSequential
-    find_library(lib_result NAMES "${library_name}" )
+check_library_exists(iphlpapi printf "" HAVE_IPHLAPI) # GetAdaptersAddresses
-#    message(STATUS "Find Library result - ${lib_result}")    
-    string(FIND "${lib_result}" "NOTFOUND" pos)
-    if (pos EQUAL -1)
-        #found library
-        message(STATUS "Looking for library ${library_name} - found")
-        set("${var_result}" "${lib_result}")
-    else()
-        # did not find library
-        message(STATUS "Looking for library ${library_name} - not found")
-        set("${var_result}" "")
-    endif()
-    #clear the find result
-    unset(lib_result CACHE)
-endmacro()
 
-#use find file instead of check_include_files
-zmq_find_include("ifaddrs.h" ZMQ_HAVE_IFADDRS)
-zmq_find_include("windows.h" ZMQ_HAVE_WINDOWS)
-zmq_find_include("sys/uio.h" ZMQ_HAVE_UIO)
-zmq_find_include("sys/eventfd.h" ZMQ_HAVE_EVENTFD)
-
-#use find library instead of check library which fails on VS2015
-zmq_find_library("ws2_32" HAVE_WS2_32)
-zmq_find_library("ws2" HAVE_WS2)
-zmq_find_library("rpcrt4" HAVE_RPCRT4) # UuidCreateSequential
-zmq_find_library("iphlpapi" HAVE_IPHLAPI) # GetAdaptersAddresses
-     
 check_cxx_symbol_exists(SO_PEERCRED sys/socket.h ZMQ_HAVE_SO_PEERCRED)
 check_cxx_symbol_exists(LOCAL_PEERCRED sys/socket.h ZMQ_HAVE_LOCAL_PEERCRED)
 
-#find_library(RT_LIBRARY rt)
+find_library(RT_LIBRARY rt)
 
-#find_package(Threads)
+find_package(Threads)
 
 
 if(WIN32 AND NOT CYGWIN)
@@ -300,14 +266,9 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   add_definitions(-D_DARWIN_C_SOURCE)
 endif()
 
-if(NOT WITHOUT_ASCIIDOC)
+set(CMAKE_PYTHON_VERSION 2.7 2.6 2.5 2.4)
-    set(CMAKE_PYTHON_VERSION 3.4 3.3 3.2 3.1 3.0 2.7 2.6 2.5 2.4)
+find_package(PythonInterp)
-    find_package(PythonInterp)
+find_package(AsciiDoc)
-    find_package(AsciiDoc)
-else()
-    set(PYTHON_FOUND OFF)
-    set(ASCIIDOC_FOUND OFF)
-endif()
 
 cmake_dependent_option(WITH_DOC "Build Reference Guide documentation(requires DocBook)" ON
                        "PYTHON_FOUND;ASCIIDOC_FOUND" OFF)
@@ -375,6 +336,9 @@ if(NOT CMAKE_BUILD_TYPE)
       FORCE)
 endif()
 
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin)
+set(LIBRARY_OUTPUT_PATH  ${CMAKE_CURRENT_BINARY_DIR}/lib)
+
 #-----------------------------------------------------------------------------
 # platform specifics
 
@@ -552,8 +516,10 @@ list(APPEND sources ${CMAKE_CURRENT_BINARY_DIR}/platform.hpp)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/libzmq.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libzmq.pc @ONLY)
 set(zmq-pkgconfig ${CMAKE_CURRENT_BINARY_DIR}/libzmq.pc)
 
+if(NOT ZMQ_BUILD_FRAMEWORK)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzmq.pc DESTINATION lib/pkgconfig)
+endif()
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzmq.pc DESTINATION lib/pkgconfig)
 
 
 if(MSVC)
@@ -618,23 +584,38 @@ if(MSVC)
   set_target_properties(libzmq PROPERTIES
     PUBLIC_HEADER "${public_headers}"
     RELEASE_POSTFIX "${_zmq_COMPILER}-mt-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-    RELWITHDEBINFO_POSTFIX "${_zmq_COMPILER}-mt-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
     DEBUG_POSTFIX "${_zmq_COMPILER}-mt-gd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
     RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
   add_library(libzmq-static STATIC ${sources})
   set_target_properties(libzmq-static PROPERTIES
     PUBLIC_HEADER "${public_headers}"
-    RELEASE_POSTFIX "${_zmq_COMPILER}-mt-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
+    RELEASE_POSTFIX "${_zmq_COMPILER}-mt-s-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-    RELWITHDEBINFO_POSTFIX "${_zmq_COMPILER}-mt-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
+    DEBUG_POSTFIX "${_zmq_COMPILER}-mt-sgd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-    DEBUG_POSTFIX "${_zmq_COMPILER}-mt-gd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib"
     COMPILE_FLAGS "/D ZMQ_STATIC"
-    OUTPUT_NAME "zmq")
+    OUTPUT_NAME "libzmq")
 else()
     add_library(libzmq SHARED ${sources} ${public_headers} ${html-docs} ${readme-docs} ${zmq-pkgconfig})
-    set_target_properties(libzmq PROPERTIES
+    if(ZMQ_BUILD_FRAMEWORK)
-                          OUTPUT_NAME "zmq"
+      set_target_properties(libzmq PROPERTIES
-                          PUBLIC_HEADER "${public_headers}")
+                            FRAMEWORK TRUE
+                            OUTPUT_NAME "ZeroMQ"
+                            PUBLIC_HEADER "${public_headers}"
+                            MACOSX_FRAMEWORK_IDENTIFIER "org.zeromq.libzmq"
+                            MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${ZMQ_VERSION}
+                            MACOSX_FRAMEWORK_BUNDLE_VERSION ${ZMQ_VERSION}
+                            VERSION ${ZMQ_VERSION}
+                            SOVERSION "${ZMQ_VERSION_MAJOR}.${ZMQ_VERSION_MINOR}.0")
+      set_source_files_properties(${html-docs} PROPERTIES
+                                  MACOSX_PACKAGE_LOCATION doc)
+      set_source_files_properties(${readme-docs} PROPERTIES
+                                  MACOSX_PACKAGE_LOCATION etc)
+      set_source_files_properties(${zmq-pkgconfig} PROPERTIES
+                                  MACOSX_PACKAGE_LOCATION lib/pkgconfig)
+    else()
+      set_target_properties(libzmq PROPERTIES
+                             OUTPUT_NAME "zmq"
+                             PUBLIC_HEADER "${public_headers}")
+    endif()
     add_library(libzmq-static STATIC ${sources} ${public_headers} ${html-docs} ${readme-docs} ${zmq-pkgconfig})
     set_target_properties(libzmq-static PROPERTIES
       PUBLIC_HEADER "${public_headers}"
@@ -668,23 +649,31 @@ set(perf-tools local_lat
                inproc_lat
                inproc_thr)
 
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") # Why?
+  foreach(perf-tool ${perf-tools})
+    add_executable(${perf-tool} perf/${perf-tool}.cpp)
+    target_link_libraries(${perf-tool} libzmq)
 
-foreach(perf-tool ${perf-tools})
-    add_executable("${perf-tool}" "perf/${perf-tool}.cpp")
-    target_link_libraries("${perf-tool}" libzmq)
-    set_target_properties("${perf-tool}" PROPERTIES
-                          RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin"
-                          COMPILE_FLAGS "-DZMQ_STATIC")
-                    
     if(RT_LIBRARY)
-      target_link_libraries("${perf-tool}" libzmq-static ${RT_LIBRARY})
+      target_link_libraries(${perf-tool} ${RT_LIBRARY})
     endif()
 
-  install(TARGETS "${perf-tool}"
+    if(ZMQ_BUILD_FRAMEWORK)
-          RUNTIME DESTINATION bin
+      # Copy perf-tools binaries into Framework
-          COMPONENT PerfTools)
+      add_custom_command(
-endforeach()
+        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}"
+        VERBATIM
+        COMMENT "Perf tools")
+    else()
+      install(TARGETS ${perf-tool}
+              RUNTIME DESTINATION bin
+              COMPONENT PerfTools)
+    endif()
+  endforeach()
+endif()
 
 #-----------------------------------------------------------------------------
 # tests
@@ -700,35 +689,54 @@ endif()
 # installer
 
 if(MSVC)
-    install(TARGETS libzmq libzmq-static EXPORT ZMQ-TARGETS
+  install(TARGETS libzmq libzmq-static
+          ARCHIVE DESTINATION lib
+          LIBRARY DESTINATION lib
+          PUBLIC_HEADER DESTINATION include
+          COMPONENT SDK)
+  if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    install(TARGETS libzmq libzmq-static
             RUNTIME DESTINATION bin
             ARCHIVE DESTINATION lib
             PUBLIC_HEADER DESTINATION include
             COMPONENT SDK)
-else()
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bin/libzmq${_zmq_COMPILER}-mt-gd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}.pdb DESTINATION lib
-    install(TARGETS libzmq libzmq-static EXPORT ZMQ-TARGETS
+            COMPONENT SDK)
+  else()
+    install(TARGETS libzmq
             RUNTIME DESTINATION bin
-            ARCHIVE DESTINATION lib
+            PUBLIC_HEADER DESTINATION include
-            FRAMEWORK DESTINATION "Library/Frameworks"
+            COMPONENT Runtime)
-            PUBLIC_HEADER DESTINATION include)
+  endif()
+else()
+  install(TARGETS libzmq libzmq-static
+          RUNTIME DESTINATION bin
+          ARCHIVE DESTINATION lib
+          LIBRARY DESTINATION lib
+          FRAMEWORK DESTINATION "Library/Frameworks"
+          PUBLIC_HEADER DESTINATION include)
 endif()
 
-#desire would be to export these with below but broken
+# install(FILES ${public_headers}
-#install(EXPORT ZMQ-TARGETS DESTINATION lib)
+#          DESTINATION include
+#          COMPONENT SDK)
 
+if(NOT ZMQ_BUILD_FRAMEWORK)
   file(GLOB private_headers "${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp")
-  install(FILES "${sources}" "${private_headers}" DESTINATION src/zmq
+  install(FILES ${sources} ${private_headers} DESTINATION src/zmq
           COMPONENT SourceCode)
+endif()
 
 foreach(readme ${readme-docs})
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${readme} ${CMAKE_CURRENT_BINARY_DIR}/${readme}.txt)
 
+  if(NOT ZMQ_BUILD_FRAMEWORK)
     if(MSVC)
       install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${readme}.txt DESTINATION .)
     else()
       install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${readme}.txt DESTINATION etc/zmq)
     endif()
-
+  endif()
 endforeach()
 
 if(WITH_DOC)
@@ -736,3 +744,104 @@ if(WITH_DOC)
     install(FILES ${html-docs} DESTINATION doc/zmq COMPONENT RefGuide)
   endif()
 endif()
+
+
+if(MSVC)
+  include(InstallRequiredSystemLibraries)
+
+  if(CMAKE_CL_64)
+    set(arch_name "x64")
+  else()
+    set(arch_name "x86")
+  endif()
+
+  set(CPACK_NSIS_DISPLAY_NAME "ZeroMQ ${ZMQ_VERSION_MAJOR}.${ZMQ_VERSION_MINOR}.${ZMQ_VERSION_PATCH}(${arch_name})")
+  set(CPACK_PACKAGE_FILE_NAME "ZeroMQ-${ZMQ_VERSION_MAJOR}.${ZMQ_VERSION_MINOR}.${ZMQ_VERSION_PATCH}-${arch_name}")
+
+  # TODO: I think this part was intended to be used when running cpack
+  # separately from cmake but I don't know how that works.
+  #
+  # macro(add_crt_version version)
+  #   set(rel_dir "${CMAKE_CURRENT_BINARY_DIR}/build/${arch_name}/${version};ZeroMQ;ALL;/")
+  #   set(debug_dir "${CMAKE_CURRENT_BINARY_DIR}/debug/${arch_name}/${version};ZeroMQ;ALL;/")
+  #   if(EXISTS ${rel_dir})
+  #     list(APPEND CPACK_INSTALL_CMAKE_PROJECTS ${rel_dir})
+  #   endif()
+
+  #   if(EXISTS ${debug_dir})
+  #     list(APPEND CPACK_INSTALL_CMAKE_PROJECTS ${rel_dir})
+  #   endmacro()
+  # endmacro()
+
+  # add_crt_version(v110)
+  # add_crt_version(v100)
+  # add_crt_version(v90)
+
+  set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+  set(CPACK_GENERATOR "NSIS")
+  set(CPACK_PACKAGE_NAME "ZeroMQ")
+  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ZeroMQ lightweight messaging kernel")
+  set(CPACK_PACKAGE_VENDOR "Miru")
+  set(CPACK_NSIS_CONTACT "Steven McCoy <Steven.McCoy@miru.hk>")
+  set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}\\\\COPYING.txt")
+#  set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}\\\\README.txt")
+#  set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_BINARY_DIR}\\\\WELCOME.txt")
+  # There is a bug in NSI that does not handle full unix paths properly. Make
+  # sure there is at least one set of four(4) backslashes.
+  set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\installer.ico")
+  set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\installer.ico")
+
+  set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\branding.bmp")
+  set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
+  set(CPACK_PACKAGE_VERSION ${ZMQ_VERSION})
+  set(CPACK_PACKAGE_VERSION_MAJOR ${ZMQ_VERSION_MAJOR})
+  set(CPACK_PACKAGE_VERSION_MINOR ${ZMQ_VERSION_MINOR})
+  set(CPACK_PACKAGE_VERSION_PATCH ${ZMQ_VERSION_PATCH})
+#  set(CPACK_PACKAGE_INSTALL_DIRECTORY "ZMQ Install Directory")
+#  set(CPACK_TEMPORARY_DIRECTORY "ZMQ Temporary CPack Directory")
+
+  include(CPack)
+
+  cpack_add_component_group(Development
+    DISPLAY_NAME "ZeroMQ software development kit"
+    EXPANDED)
+  cpack_add_component(PerfTools
+    DISPLAY_NAME "ZeroMQ performance tools"
+    INSTALL_TYPES FullInstall DevInstall)
+  cpack_add_component(SourceCode
+    DISPLAY_NAME "ZeroMQ source code"
+    DISABLED
+    INSTALL_TYPES FullInstall)
+  cpack_add_component(SDK
+    DISPLAY_NAME "ZeroMQ headers and libraries"
+    INSTALL_TYPES FullInstall DevInstall
+    GROUP Development)
+  if(WITH_DOC)
+    cpack_add_component(RefGuide
+      DISPLAY_NAME "ZeroMQ reference guide"
+      INSTALL_TYPES FullInstall DevInstall
+      GROUP Development)
+  endif()
+  cpack_add_component(Runtime
+    DISPLAY_NAME "ZeroMQ runtime files"
+    REQUIRED
+    INSTALL_TYPES FullInstall DevInstall MinInstall)
+  cpack_add_install_type(FullInstall
+    DISPLAY_NAME "Full install, including source code")
+  cpack_add_install_type(DevInstall
+    DISPLAY_NAME "Developer install, headers and libraries")
+  cpack_add_install_type(MinInstall
+    DISPLAY_NAME "Minimal install, runtime only")
+endif()
+
+# Export this for library to help build this as a sub-project
+set(ZEROMQ_LIBRARY libzmq CACHE STRING "ZeroMQ library")
+
+# Workaround for MSVS10 to avoid the Dialog Hell
+# FIXME: This could be removed with future version of CMake.
+if(MSVC_VERSION EQUAL 1600)
+  set(ZMQ_SLN_FILENAME "${CMAKE_CURRENT_BINARY_DIR}/ZeroMQ.sln")
+  if(EXISTS "${ZMQ_SLN_FILENAME}")
+    file(APPEND "${ZMQ_SLN_FILENAME}" "\n# This should be regenerated!\n")
+  endif()
+endif()

builds/cmake/Modules/FindAsciiDoc.cmake

@@ -7,16 +7,17 @@
 # A2X_FOUND - If false, don't attempt to use a2x.
 
 find_program(ASCIIDOC_EXECUTABLE asciidoc asciidoc.py
-             PATHS ENV "ASCIIDOC_ROOT"
+             PATHS "$ENV{ASCIIDOC_ROOT}"
-                   ENV "PROGRAMW6432" PATH_SUFFIXES "/asciidoc"
+                   "$ENV{PROGRAMW6432}/asciidoc"
-                   ENV "PROGRAMFILES" PATH_SUFFIXES "/asciidoc"
+                   "$ENV{PROGRAMFILES}/asciidoc"
-                   ENV "PROGRAMFILES(X86)" PATH_SUFFIXES "/asciidoc")
+                   "$ENV{PROGRAMFILES(X86)}/asciidoc")
 
 find_program(A2X_EXECUTABLE a2x
-             PATHS ENV "ASCIIDOC_ROOT"
+             PATHS "$ENV{ASCIIDOC_ROOT}"
-                   ENV "PROGRAMW6432" PATH_SUFFIXES "/asciidoc"
+                   "$ENV{PROGRAMW6432}/asciidoc"
-                   ENV "PROGRAMFILES" PATH_SUFFIXES "/asciidoc"
+                   "$ENV{PROGRAMFILES}/asciidoc"
-                   ENV "PROGRAMFILES(X86)" PATH_SUFFIXES "/asciidoc")
+                   "$ENV{PROGRAMFILES(X86)}/asciidoc")
+
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_ARGS(AsciiDoc REQUIRED_VARS ASCIIDOC_EXECUTABLE)

tests/CMakeLists.txt

@@ -63,18 +63,16 @@ if(NOT WIN32)
 endif()
 
 foreach(test ${tests})
-  add_executable("${test}" "${test}.cpp")
+  add_executable(${test} ${test}.cpp)
-  target_link_libraries("${test}" libzmq)
+  target_link_libraries(${test} libzmq)
-  set_target_properties("${test}" PROPERTIES
-    			RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
 
   if(RT_LIBRARY)
-    target_link_libraries("${test}" "${RT_LIBRARY}" )
+    target_link_libraries(${test} ${RT_LIBRARY} )
   endif()
   if(WIN32)
-    add_test(NAME "${test}" WORKING_DIRECTORY "${LIBRARY_OUTPUT_PATH}" COMMAND "${test}")
+    add_test(NAME ${test} WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH} COMMAND ${test})
   else()
-    add_test(NAME "${test}" COMMAND "${test}")
+    add_test(NAME ${test} COMMAND ${test})
   endif()
 endforeach()