Skip to content

Commit

Permalink
Fixed Exports
Browse files Browse the repository at this point in the history
  • Loading branch information
ErniBrown committed Jun 21, 2017
1 parent d54b59b commit 7db5f7d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
16 changes: 8 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,12 @@ list(APPEND CMAKE_MODULE_PATH "${SOURCE_DIR}")
# ZMQ dependency
########################################################################
hunter_add_package(ZeroMQ)
find_package(ZeroMQ REQUIRED)
include_directories(${ZEROMQ_INCLUDE_DIRS})
list(APPEND MORE_LIBRARIES ${ZEROMQ_LIBRARIES})
find_package(ZeroMQ CONFIG REQUIRED)
if(BUILD_SHARED_LIBS)
set(LIBZMQ_TARGET "ZeroMQ::libzmq")
else()
set(LIBZMQ_TARGET "ZeroMQ::libzmq-static")
endif()

########################################################################
# Threads dependency
Expand Down Expand Up @@ -206,12 +209,9 @@ set (czmq_sources
src/zthread.c
)
source_group ("Source Files" FILES ${czmq_sources})
if (NOT DEFINED BUILD_SHARED_LIBS)
SET(BUILD_SHARED_LIBS ON)
endif()
add_library(czmq ${czmq_sources})
set_target_properties(czmq PROPERTIES DEFINE_SYMBOL "LIBCZMQ_EXPORTS")
target_link_libraries(czmq ${ZEROMQ_LIBRARIES} ${MORE_LIBRARIES})
target_link_libraries(czmq ${LIBZMQ_TARGET} ${MORE_LIBRARIES})

set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")

Expand Down Expand Up @@ -273,7 +273,7 @@ install(
# tests
########################################################################
add_executable(czmq_selftest "${SOURCE_DIR}/src/czmq_selftest.c")
target_link_libraries(czmq_selftest czmq ${ZEROMQ_LIBRARIES} Threads::Threads)
target_link_libraries(czmq_selftest czmq ${LIBZMQ_TARGET} Threads::Threads)
add_test(czmq_selftest czmq_selftest)

########################################################################
Expand Down
3 changes: 3 additions & 0 deletions cmake/Config.cmake.in
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
include(CMakeFindDependencyMacro)
find_dependency(ZeroMQ CONFIG)

include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")

0 comments on commit 7db5f7d

Please sign in to comment.