Skip to content
Permalink
Browse files

Problem: CMake stuffs out of sync with zproject

Solution: Regenerate with `gsl -target:cmake project.xml`
  • Loading branch information...
myd7349 committed Jun 25, 2019
1 parent 8c64fe1 commit 30f52a0e031ffd558c1325b3a591ae90e041e1bd
Showing with 7 additions and 18 deletions.
  1. +1 −1 CMakeLists.txt
  2. +1 −1 Findczmq.cmake
  3. +5 −16 Findlibzmq.cmake
@@ -6,7 +6,7 @@
########################################################################
# Project setup
########################################################################
cmake_minimum_required(VERSION 2.8.8)
cmake_minimum_required(VERSION 2.8.12)
project(zyre)
enable_language(C)
enable_testing()
@@ -25,7 +25,7 @@ find_path (

find_library (
CZMQ_LIBRARIES
NAMES czmq
NAMES libczmq czmq
HINTS ${PC_CZMQ_LIBRARY_HINTS}
)

@@ -44,9 +44,6 @@ if (MSVC)

set(_zmq_version ${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH})

set(_zmq_debug_names)
set(_zmq_release_names)

set(_zmq_debug_names
"libzmq${MSVC_TOOLSET}-mt-gd-${_zmq_version}" # Debug, BUILD_SHARED
"libzmq${MSVC_TOOLSET}-mt-sgd-${_zmq_version}" # Debug, BUILD_STATIC
@@ -61,30 +58,22 @@ if (MSVC)
"libzmq-mt-s-${_zmq_version}" # Release|RelWithDebInfo|MinSizeRel, BUILD_STATIC
)

find_library (ZeroMQ_LIBRARY_DEBUG
find_library (LIBZMQ_LIBRARY_DEBUG
NAMES ${_zmq_debug_names}
)

find_library (ZeroMQ_LIBRARY_RELEASE
find_library (LIBZMQ_LIBRARY_RELEASE
NAMES ${_zmq_release_names}
)

if (ZeroMQ_LIBRARY_RELEASE AND ZeroMQ_LIBRARY_DEBUG)
set(LIBZMQ_LIBRARIES
debug ${ZeroMQ_LIBRARY_DEBUG}
optimized ${ZeroMQ_LIBRARY_RELEASE}
)
elseif (ZeroMQ_LIBRARY_RELEASE)
set(LIBZMQ_LIBRARIES ${ZeroMQ_LIBRARY_RELEASE})
elseif (ZeroMQ_LIBRARY_DEBUG)
set(LIBZMQ_LIBRARIES ${ZeroMQ_LIBRARY_DEBUG})
endif ()
include(SelectLibraryConfigurations)
select_library_configurations(LIBZMQ)
endif ()

if (NOT LIBZMQ_LIBRARIES)
find_library (
LIBZMQ_LIBRARIES
NAMES zmq libzmq
NAMES libzmq zmq
HINTS ${PC_LIBZMQ_LIBRARY_HINTS}
)
endif ()

0 comments on commit 30f52a0

Please sign in to comment.
You can’t perform that action at this time.