fixes #685 cmake needs to deliver libnanomsg.pc (pkg-config data file)
fixes #561 includedir goes too deep
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3db3d11..42d8a3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,8 @@
cmake_policy (SET CMP0042 NEW)
endif ()
-set (ISSUE_REPORT_MSG "Please consider opening an issue at https://github.com/nanomsg/nanomsg with your findings")
+set (NN_DESCRIPTION "High-Performance Scalability Protocols")
+set (ISSUE_REPORT_MSG "Please consider opening an issue at https://github.com/nanomsg/nanomsg")
# Determine library versions.
@@ -151,44 +152,47 @@
endif ()
endmacro (nn_check_struct_member)
-# Unconditionally declare the following feature test macros. These are
-# needed for some platforms (glibc and SunOS/illumos) and should be harmless
-# on the others.
-add_definitions (-D_GNU_SOURCE)
-add_definitions (-D_REENTRANT)
-add_definitions (-D_THREAD_SAFE)
-add_definitions (-D_POSIX_PTHREAD_SEMANTICS)
+if (WIN32)
+ # Windows is a special snowflake.
+ set(NN_REQUIRED_LIBRARIES ${NN_REQUIRED_LIBRARIES} ws2_32)
+ set(NN_REQUIRED_LIBRARIES ${NN_REQUIRED_LIBRARIES} mswsock)
+ set(NN_REQUIRED_LIBRARIES ${NN_REQUIRED_LIBRARIES} advapi32)
+else ()
+ # Unconditionally declare the following feature test macros. These are
+ # needed for some platforms (glibc and SunOS/illumos) and should be harmless
+ # on the others.
+ add_definitions (-D_GNU_SOURCE)
+ add_definitions (-D_REENTRANT)
+ add_definitions (-D_THREAD_SAFE)
+ add_definitions (-D_POSIX_PTHREAD_SEMANTICS)
-nn_check_func (gethrtime NN_HAVE_GETHRTIME)
-nn_check_func (socketpair NN_HAVE_SOCKETPAIR)
-nn_check_func (eventfd NN_HAVE_EVENTFD)
-nn_check_func (pipe NN_HAVE_PIPE)
-nn_check_func (pipe2 NN_HAVE_PIPE2)
-nn_check_func (accept4 NN_HAVE_ACCEPT4)
-nn_check_func (epoll_create NN_HAVE_EPOLL)
-nn_check_func (kqueue NN_HAVE_KQUEUE)
-nn_check_func (poll NN_HAVE_POLL)
+ nn_check_func (gethrtime NN_HAVE_GETHRTIME)
+ nn_check_func (socketpair NN_HAVE_SOCKETPAIR)
+ nn_check_func (eventfd NN_HAVE_EVENTFD)
+ nn_check_func (pipe NN_HAVE_PIPE)
+ nn_check_func (pipe2 NN_HAVE_PIPE2)
+ nn_check_func (accept4 NN_HAVE_ACCEPT4)
+ nn_check_func (epoll_create NN_HAVE_EPOLL)
+ nn_check_func (kqueue NN_HAVE_KQUEUE)
+ nn_check_func (poll NN_HAVE_POLL)
-nn_check_lib (anl getaddrinfo_a NN_HAVE_GETADDRINFO_A)
-nn_check_lib (rt clock_gettime NN_HAVE_CLOCK_GETTIME)
-nn_check_lib (rt sem_wait NN_HAVE_SEMAPHORE_RT)
-nn_check_lib (pthread sem_wait NN_HAVE_SEMAPHORE_PTHREAD)
+ nn_check_lib (anl getaddrinfo_a NN_HAVE_GETADDRINFO_A)
+ nn_check_lib (rt clock_gettime NN_HAVE_CLOCK_GETTIME)
+ nn_check_lib (rt sem_wait NN_HAVE_SEMAPHORE_RT)
+ nn_check_lib (pthread sem_wait NN_HAVE_SEMAPHORE_PTHREAD)
+ nn_check_lib (nsl gethostbyname NN_HAVE_LIBNSL)
+ nn_check_lib (socket socket NN_HAVE_LIBSOCKET)
-nn_check_lib (nsl gethostbyname NN_HAVE_LIBNSL)
-nn_check_lib (socket socket NN_HAVE_LIBSOCKET)
-nn_check_sym (CLOCK_MONOTONIC time.h NN_HAVE_CLOCK_MONOTONIC)
-nn_check_sym (atomic_cas_32 atomic.h NN_HAVE_ATOMIC_SOLARIS)
-
-nn_check_struct_member(msghdr msg_control sys/socket.h NN_HAVE_MSG_CONTROL)
-
-# Windows defines AF_UNIX in winsock2.h rather than sys/socket.h, so
-# we don't need to blacklist windows in the check.
-nn_check_sym (AF_UNIX sys/socket.h NN_HAVE_UNIX_SOCKETS)
-
-if (NN_HAVE_SEMAPHORE_RT OR NN_HAVE_SEMAPHORE_PTHREAD)
- add_definitions (-DNN_HAVE_SEMAPHORE)
+ nn_check_sym (CLOCK_MONOTONIC time.h NN_HAVE_CLOCK_MONOTONIC)
+ nn_check_sym (atomic_cas_32 atomic.h NN_HAVE_ATOMIC_SOLARIS)
+ nn_check_sym (AF_UNIX sys/socket.h NN_HAVE_UNIX_SOCKETS)
+ nn_check_struct_member(msghdr msg_control sys/socket.h NN_HAVE_MSG_CONTROL)
+ if (NN_HAVE_SEMAPHORE_RT OR NN_HAVE_SEMAPHORE_PTHREAD)
+ add_definitions (-DNN_HAVE_SEMAPHORE)
+ endif ()
endif ()
+
if (NOT NN_ENABLE_GETADDRINFO_A)
add_definitions (-DNN_DISABLE_GETADDRINFO_A)
endif ()
@@ -391,8 +395,6 @@
endif ()
-# NSIS package
-
install (FILES src/nn.h DESTINATION include/nanomsg)
install (FILES src/inproc.h DESTINATION include/nanomsg)
install (FILES src/ipc.h DESTINATION include/nanomsg)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c1fc2ca..a26c295 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -356,21 +356,23 @@
set_target_properties (${PROJECT_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
target_link_libraries (${PROJECT_NAME} ${NN_REQUIRED_LIBRARIES})
-if (WIN32)
- target_link_libraries (${PROJECT_NAME} ws2_32)
- target_link_libraries (${PROJECT_NAME} mswsock)
- target_link_libraries (${PROJECT_NAME} advapi32)
-elseif (UNIX)
- if(THREADS_HAVE_PTHREAD_ARG)
- add_definitions (-pthread)
- endif()
- if(CMAKE_THREAD_LIBS_INIT)
- target_link_libraries (${PROJECT_NAME} "${CMAKE_THREAD_LIBS_INIT}")
- endif()
-else ()
- message (FATAL_ERROR "Assertion failed; this path is unreachable.")
-endif ()
+if(THREADS_HAVE_PTHREAD_ARG)
+ add_definitions (-pthread)
+endif()
+if(CMAKE_THREAD_LIBS_INIT)
+ target_link_libraries (${PROJECT_NAME} "${CMAKE_THREAD_LIBS_INIT}")
+endif()
+# pkg-config file
+if(NN_REQUIRED_LIBRARIES)
+ foreach (lib ${NN_REQUIRED_LIBRARIES})
+ set (NN_REQUIRED_LFLAGS "${NN_REQUIRED_LFLAGS} -l${lib}")
+ endforeach()
+endif()
+configure_file (pkgconfig.in ${PROJECT_NAME}.pc @ONLY)
+install (
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
install (TARGETS ${PROJECT_NAME}
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
diff --git a/src/pkgconfig.in b/src/pkgconfig.in
index 6d5eeb3..1e2e6cd 100644
--- a/src/pkgconfig.in
+++ b/src/pkgconfig.in
@@ -6,7 +6,8 @@
Name: @CMAKE_PROJECT_NAME@
Description: @NN_DESCRIPTION@
URL: http://nanomsg.org/
-Version: @NN_VERSION_STR@
+Version: @NN_PACKAGE_VERSION@
Requires:
Libs: -L${libdir} -l@CMAKE_PROJECT_NAME@
+Libs.private:@NN_REQUIRED_LFLAGS@
Cflags: -I${includedir}
