commit 89e500c72ee0465c6f70458af0ef9afc0e6f89f1
author Martin Sustrik <sustrik@250bpm.com> Sun Jan 06 00:49:29 2013 +0100
committer Martin Sustrik <sustrik@250bpm.com> Sun Jan 06 00:49:29 2013 +0100
tree 84fcfff3c372b124be9e00bb55bc14f42d772d5d
parent ae5f79e1adf2f07b666a145420d5bf3f7cd7c75f

Fix build on Solaris OS

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d908cc..d6a9721 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,28 +30,30 @@
 #  Platform checks.
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    set (SP_HAVE_LINUX)
+    set (SP_HAVE_LINUX 1)
     add_definitions (-DSP_HAVE_LINUX)
 endif ()
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-    set (SP_HAVE_WINDOWS)
+    set (SP_HAVE_WINDOWS 1)
     add_definitions (-DSP_HAVE_WINDOWS)
 endif ()
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    set (SP_HAVE_OSX)
+    set (SP_HAVE_OSX 1)
     add_definitions (-DSP_HAVE_OSX)
 endif ()
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-    set (SP_HAVE_FREEBSD)
+    set (SP_HAVE_FREEBSD 1)
     add_definitions (-DSP_HAVE_FREEBSD)
 endif ()
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-    set (SP_HAVE_SOLARIS)
+    set (SP_HAVE_SOLARIS 1)
     add_definitions (-DSP_HAVE_SOLARIS)
+    list (APPEND CMAKE_REQUIRED_LIBRARIES socket)
+    list (APPEND CMAKE_REQUIRED_LIBRARIES nsl)
 endif ()
 
 #  Feature checks.

src/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 96fa823..c3f8844 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -171,15 +171,20 @@
 
 add_definitions (-DSP_EXPORTS)
 
-if (UNIX AND NOT APPLE)
+if (UNIX AND NOT SP_HAVE_OSX)
     target_link_libraries (nanomsg rt)
 endif ()
 
-if (WIN32)
+if (SP_HAVE_WINDOWS)
     target_link_libraries (nanomsg ws2_32)
     target_link_libraries (nanomsg Mswsock.lib)
 endif ()
 
+if (SP_HAVE_SOLARIS)
+    target_link_libraries (nanomsg socket)
+    target_link_libraries (nanomsg nsl)
+endif ()
+
 target_link_libraries (nanomsg ${CMAKE_THREAD_LIBS_INIT})
 
 install (TARGETS nanomsg DESTINATION lib)