[brlcad-commits] SF.net SVN: brlcad:[58282] brlcad/trunk/src/librtserver/CMakeLists.txt

[<sta...@us...>]

Revision: 58282
          http://sourceforge.net/p/brlcad/code/58282
Author:   starseeker
Date:     2013-10-24 14:23:16 +0000 (Thu, 24 Oct 2013)
Log Message:
-----------
rtserver is hardcoded to pthread at the moment - don't try building it unless we've got HAVE_PTHREAD_H

Modified Paths:
--------------
    brlcad/trunk/src/librtserver/CMakeLists.txt

Modified: brlcad/trunk/src/librtserver/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/librtserver/CMakeLists.txt	2013-10-24 04:41:53 UTC (rev 58281)
+++ brlcad/trunk/src/librtserver/CMakeLists.txt	2013-10-24 14:23:16 UTC (rev 58282)
@@ -1,21 +1,25 @@
-# Include directories needed by librtserver users
-set(RTSERVER_INCLUDE_DIRS
-	${BRLCAD_BINARY_DIR}/include
-	${BRLCAD_SOURCE_DIR}/include
-	${BU_INCLUDE_DIRS}
-	${BN_INCLUDE_DIRS}
-	${RT_INCLUDE_DIRS}
-	${JNI_INCLUDE_DIRS}
-	)
-BRLCAD_LIB_INCLUDE_DIRS(rtserver RTSERVER_INCLUDE_DIRS "")
+# Currently, rtserver requires pthread to work - conditionalize on that test
+if(HAVE_PTHREAD_H)
+  # Include directories needed by librtserver users
+  set(RTSERVER_INCLUDE_DIRS
+    ${BRLCAD_BINARY_DIR}/include
+    ${BRLCAD_SOURCE_DIR}/include
+    ${BU_INCLUDE_DIRS}
+    ${BN_INCLUDE_DIRS}
+    ${RT_INCLUDE_DIRS}
+    ${JNI_INCLUDE_DIRS}
+    )
+  BRLCAD_LIB_INCLUDE_DIRS(rtserver RTSERVER_INCLUDE_DIRS "")
 
-BRLCAD_ADDLIB(rtserver rtserver.c "librt;libbn;libbu;${WINSOCK_LIB};${ZLIB_LIBRARY}")
-set_target_properties(rtserver PROPERTIES VERSION 20.0.1 SOVERSION 20)
-set_target_properties(rtserver PROPERTIES SUFFIX ".jnilib")
+  BRLCAD_ADDLIB(rtserver rtserver.c "librt;libbn;libbu;${WINSOCK_LIB};${ZLIB_LIBRARY}")
+  set_target_properties(rtserver PROPERTIES VERSION 20.0.1 SOVERSION 20)
+  set_target_properties(rtserver PROPERTIES SUFFIX ".jnilib")
 
-BRLCAD_ADDEXEC(rtserverTest rtserverTest.c "libbu;rtserver" NO_INSTALL)
+  BRLCAD_ADDEXEC(rtserverTest rtserverTest.c "libbu;rtserver" NO_INSTALL)
+else(HAVE_PTHREAD_H)
+  CMAKEFILES(rtserver.c rtserverTest.c)
+endif(HAVE_PTHREAD_H)
 
-
 # Local Variables:
 # tab-width: 8
 # mode: cmake

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.