Skip to content

Commit

Permalink
regenerate from zproject
Browse files Browse the repository at this point in the history
  • Loading branch information
@sphaero
sphaero committed Dec 14, 2017
1 parent fd77b0f commit bccf4a6
Show file tree
Hide file tree
Showing 22 changed files with 467 additions and 298 deletions.
156 changes: 138 additions & 18 deletions CMakeLists.txt
View file
Expand Up @@ -92,7 +92,7 @@ if (MSVC)
endif()

# specific case of windows UWP
if( ${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore" AND ${CMAKE_SYSTEM_VERSION} STREQUAL "10.0")
if( "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore" AND "${CMAKE_SYSTEM_VERSION}" STREQUAL "10.0")
ADD_DEFINITIONS(-DZMQ_HAVE_WINDOWS_UWP)
ADD_DEFINITIONS(-D_WIN32_WINNT=_WIN32_WINNT_WIN10)
endif()
Expand Down Expand Up @@ -135,6 +135,16 @@ ELSE (CZMQ_FOUND)
message( FATAL_ERROR "czmq not found." )
ENDIF (CZMQ_FOUND)

########################################################################
# version
########################################################################
set(ZYRE_VERSION_MAJOR 2)
set(ZYRE_VERSION_MINOR 0)
set(ZYRE_VERSION_PATCH 1)
set(ZYRE_VERSION "${ZYRE_VERSION_MAJOR}.${ZYRE_VERSION_MINOR}.${ZYRE_VERSION_PATCH}")
message(STATUS "Detected ZYRE Version - ${ZYRE_VERSION}")


########################################################################
# includes
########################################################################
Expand Down Expand Up @@ -170,28 +180,70 @@ IF (ENABLE_DRAFTS)
ENDIF (ENABLE_DRAFTS)

source_group("Source Files" FILES ${zyre_sources})
if (NOT DEFINED BUILD_SHARED_LIBS)
SET(BUILD_SHARED_LIBS ON)


option(ZYRE_BUILD_SHARED "Whether or not to build the shared object" ON)
option(ZYRE_BUILD_STATIC "Whether or not to build the static archive" ON)

if (NOT ZYRE_BUILD_SHARED AND NOT ZYRE_BUILD_STATIC)
message(FATAL_ERROR "Neither static nor shared library build enabled")
endif()
add_library(zyre ${zyre_sources})
set_target_properties(zyre
PROPERTIES DEFINE_SYMBOL "ZYRE_EXPORTS"
)
set_target_properties (zyre
PROPERTIES SOVERSION "2"
)
set_target_properties (zyre
PROPERTIES VERSION "2.0.1"
)
target_link_libraries(zyre

# shared
if (ZYRE_BUILD_SHARED)
add_library(zyre SHARED ${zyre_sources})

set_target_properties (zyre PROPERTIES
PUBLIC_HEADER "${public_headers}"
DEFINE_SYMBOL "ZYRE_EXPORTS"
SOVERSION "2"
VERSION "${ZYRE_VERSION}"
COMPILE_DEFINITIONS "DLL_EXPORT"
)

target_link_libraries(zyre
${ZEROMQ_LIBRARIES} ${MORE_LIBRARIES}
)
)

install(TARGETS zyre
install(TARGETS zyre
LIBRARY DESTINATION "lib${LIB_SUFFIX}" # .so file
ARCHIVE DESTINATION "lib${LIB_SUFFIX}" # .lib file
RUNTIME DESTINATION bin # .dll file
)
RUNTIME DESTINATION bin # .dll file
)

target_include_directories(zyre
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
)
endif()

# static
if (ZYRE_BUILD_STATIC)
add_library(zyre-static STATIC ${zyre_sources})

set_target_properties(zyre-static PROPERTIES
PUBLIC_HEADER "${public_headers}"
COMPILE_DEFINITIONS "ZYRE_STATIC"
)

target_link_libraries(zyre-static
${ZEROMQ_LIBRARIES} ${MORE_LIBRARIES}
)

install(TARGETS zyre-static
LIBRARY DESTINATION "lib${LIB_SUFFIX}" # .so file
ARCHIVE DESTINATION "lib${LIB_SUFFIX}" # .lib file
RUNTIME DESTINATION bin # .dll file
)

target_include_directories(zyre-static
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
)
target_compile_definitions(zyre-static
PUBLIC ZYRE_STATIC
)

endif()


include(${CMAKE_CURRENT_SOURCE_DIR}/src/CMakeLists-local.txt) # Optional project-local hook

Expand Down Expand Up @@ -225,71 +277,137 @@ add_executable(
perf_local
"${SOURCE_DIR}/src/perf_local.c"
)
if (TARGET zyre)
target_link_libraries(
perf_local
zyre
${LIBZMQ_LIBRARIES}
${CZMQ_LIBRARIES}
${OPTIONAL_LIBRARIES}
)
endif()
if (NOT TARGET zyre AND TARGET zyre-static)
target_link_libraries(
perf_local
zyre-static
${LIBZMQ_LIBRARIES}
${CZMQ_LIBRARIES}
${OPTIONAL_LIBRARIES}
)
endif()
add_executable(
perf_remote
"${SOURCE_DIR}/src/perf_remote.c"
)
if (TARGET zyre)
target_link_libraries(
perf_remote
zyre
${LIBZMQ_LIBRARIES}
${CZMQ_LIBRARIES}
${OPTIONAL_LIBRARIES}
)
endif()
if (NOT TARGET zyre AND TARGET zyre-static)
target_link_libraries(
perf_remote
zyre-static
${LIBZMQ_LIBRARIES}
${CZMQ_LIBRARIES}
${OPTIONAL_LIBRARIES}
)
endif()
add_executable(
zpinger
"${SOURCE_DIR}/src/zpinger.c"
)
if (TARGET zyre)
target_link_libraries(
zpinger
zyre
${LIBZMQ_LIBRARIES}
${CZMQ_LIBRARIES}
${OPTIONAL_LIBRARIES}
)
endif()
if (NOT TARGET zyre AND TARGET zyre-static)
target_link_libraries(
zpinger
zyre-static
${LIBZMQ_LIBRARIES}
${CZMQ_LIBRARIES}
${OPTIONAL_LIBRARIES}
)
endif()
install(TARGETS zpinger
RUNTIME DESTINATION bin
)
add_executable(
ztester_beacon
"${SOURCE_DIR}/src/ztester_beacon.c"
)
if (TARGET zyre)
target_link_libraries(
ztester_beacon
zyre
${LIBZMQ_LIBRARIES}
${CZMQ_LIBRARIES}
${OPTIONAL_LIBRARIES}
)
endif()
if (NOT TARGET zyre AND TARGET zyre-static)
target_link_libraries(
ztester_beacon
zyre-static
${LIBZMQ_LIBRARIES}
${CZMQ_LIBRARIES}
${OPTIONAL_LIBRARIES}
)
endif()
add_executable(
ztester_gossip
"${SOURCE_DIR}/src/ztester_gossip.c"
)
if (TARGET zyre)
target_link_libraries(
ztester_gossip
zyre
${LIBZMQ_LIBRARIES}
${CZMQ_LIBRARIES}
${OPTIONAL_LIBRARIES}
)
endif()
if (NOT TARGET zyre AND TARGET zyre-static)
target_link_libraries(
ztester_gossip
zyre-static
${LIBZMQ_LIBRARIES}
${CZMQ_LIBRARIES}
${OPTIONAL_LIBRARIES}
)
endif()
add_executable(
zyre_selftest
"${SOURCE_DIR}/src/zyre_selftest.c"
)
if (TARGET zyre)
target_link_libraries(
zyre_selftest
zyre
${LIBZMQ_LIBRARIES}
${CZMQ_LIBRARIES}
${OPTIONAL_LIBRARIES}
)
endif()
if (NOT TARGET zyre AND TARGET zyre-static)
target_link_libraries(
zyre_selftest
zyre-static
${LIBZMQ_LIBRARIES}
${CZMQ_LIBRARIES}
${OPTIONAL_LIBRARIES}
)
endif()

########################################################################
# tests
Expand Down Expand Up @@ -393,6 +511,8 @@ message (STATUS " C compiler : ${CMAKE_C_COMPILER}")
message (STATUS " Debug C flags : ${CMAKE_C_FLAGS_DEBUG} ${CMAKE_C_FLAGS}")
message (STATUS " Release C flags : ${CMAKE_C_FLAGS_RELEASE} ${CMAKE_C_FLAGS}")
message (STATUS " Build type : ${CMAKE_BUILD_TYPE}")
message (STATUS " Static build : ${ZYRE_BUILD_STATIC}")
message (STATUS " Shared build : ${ZYRE_BUILD_SHARED}")
IF (ENABLE_DRAFTS)
message (STATUS " Draft API : Yes")
ELSE (ENABLE_DRAFTS)
Expand Down
1 change: 0 additions & 1 deletion bindings/jni/msvc/vs2010/libzyrejni/libzyrejni.props
View file
Expand Up @@ -32,7 +32,6 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\..\libzmq\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\..\czmq\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
Expand Down
1 change: 0 additions & 1 deletion bindings/jni/msvc/vs2012/libzyrejni/libzyrejni.props
View file
Expand Up @@ -32,7 +32,6 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\..\libzmq\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\..\czmq\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
Expand Down
1 change: 0 additions & 1 deletion bindings/jni/msvc/vs2013/libzyrejni/libzyrejni.props
View file
Expand Up @@ -32,7 +32,6 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\..\libzmq\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\..\czmq\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
Expand Down
1 change: 0 additions & 1 deletion bindings/jni/msvc/vs2015/libzyrejni/libzyrejni.props
View file
Expand Up @@ -32,7 +32,6 @@
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\..\libzmq\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\..\czmq\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsC</CompileAs>
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
Expand Down

0 comments on commit bccf4a6

Please sign in to comment.