[Playerstage-commit] SF.net SVN: playerstage: [4473] code/player/branches/cmake

[<ge...@us...>]

Revision: 4473
          http://playerstage.svn.sourceforge.net/playerstage/?rev=4473&view=rev
Author:   gerkey
Date:     2008-04-03 14:37:19 -0700 (Thu, 03 Apr 2008)

Log Message:
-----------
fixed for OS X build

Modified Paths:
--------------
    code/player/branches/cmake/client_libs/libplayerc++/CMakeLists.txt
    code/player/branches/cmake/examples/libplayerc++/CMakeLists.txt
    code/player/branches/cmake/examples/plugins/exampledriver/CMakeLists.txt
    code/player/branches/cmake/examples/plugins/exampleinterface/CMakeLists.txt
    code/player/branches/cmake/examples/plugins/multidriver/CMakeLists.txt
    code/player/branches/cmake/examples/plugins/opaquedriver/CMakeLists.txt
    code/player/branches/cmake/libplayercore/CMakeLists.txt
    code/player/branches/cmake/libplayertcp/CMakeLists.txt
    code/player/branches/cmake/utils/pmap/CMakeLists.txt

Modified: code/player/branches/cmake/client_libs/libplayerc++/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/client_libs/libplayerc++/CMakeLists.txt	2008-04-03 20:56:34 UTC (rev 4472)
+++ code/player/branches/cmake/client_libs/libplayerc++/CMakeLists.txt	2008-04-03 21:37:19 UTC (rev 4473)
@@ -1,53 +1,58 @@
 ADD_SUBDIRECTORY (test)
 
 OPTION (BUILD_PLAYERCC "Build the C++ client library" ON)
+OPTION (BUILD_PLAYERCC_BOOST "Include Boost support in the C++ client library" ON)
 IF (BUILD_PLAYERCC)
     SET (PLAYERCC_DEFINITIONS "" CACHE INTERNAL "" FORCE)   # Clear this out to prevent unnecessary duplication and rebuilding
     # Look for Boost libraries
     SET (boostLinkLibs)
-    FIND_PACKAGE (Boost)
-    IF (Boost_FOUND)
-        # TODO: there may be a new, much better, FindBoost.cmake coming in 2.6
-        # For now, assume that if boost is found then both signals and threads are present
-        SET (HAVE_BOOST_THREAD TRUE INTERNAL)
-        IF (HAVE_BOOST_THREAD)
-            OPTION (USE_BOOST_THREADS "Use the Boost threading library" ON)
-            MARK_AS_ADVANCED (USE_BOOST_THREADS)
-            IF (USE_BOOST_THREADS)
-                MESSAGE (STATUS "PlayerC++ client library will be built with Boost::Thread support.")
-                PLAYERCC_ADD_LINK_LIB (boost_thread)
-                INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS})
-                LINK_DIRECTORIES (${Boost_LIBRARY_DIRS})
-                APPEND_TO_CACHED_STRING (PLAYERCC_DEFINITIONS "libplayerc++ defines" -DHAVE_BOOST_THREAD -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT)
-                SET (boostLinkLibs "${boostLinkLibs} -lboost_thread")
-            ELSE (USE_BOOST_THREADS)
-                MESSAGE (STATUS "PlayerC++ client library Boost::Thread support disabled by user.")
-            ENDIF (USE_BOOST_THREADS)
-        ELSE (HAVE_BOOST_THREAD)
-            MESSAGE (STATUS "PlayerC++ client library Boost::Thread support disabled - Boost::Thread library not found.")
-        ENDIF (HAVE_BOOST_THREAD)
+    IF (BUILD_PLAYERCC_BOOST)
+      FIND_PACKAGE (Boost)
+      IF (Boost_FOUND)
+          # TODO: there may be a new, much better, FindBoost.cmake coming in 2.6
+          # For now, assume that if boost is found then both signals and threads are present
+          SET (HAVE_BOOST_THREAD TRUE INTERNAL)
+          IF (HAVE_BOOST_THREAD)
+              OPTION (USE_BOOST_THREADS "Use the Boost threading library" ON)
+              MARK_AS_ADVANCED (USE_BOOST_THREADS)
+              IF (USE_BOOST_THREADS)
+                  MESSAGE (STATUS "PlayerC++ client library will be built with Boost::Thread support.")
+                  PLAYERCC_ADD_LINK_LIB (boost_thread)
+                  INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS})
+                  LINK_DIRECTORIES (${Boost_LIBRARY_DIRS})
+                  APPEND_TO_CACHED_STRING (PLAYERCC_DEFINITIONS "libplayerc++ defines" -DHAVE_BOOST_THREAD -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT)
+                  SET (boostLinkLibs "${boostLinkLibs} -lboost_thread")
+              ELSE (USE_BOOST_THREADS)
+                  MESSAGE (STATUS "PlayerC++ client library Boost::Thread support disabled by user.")
+              ENDIF (USE_BOOST_THREADS)
+          ELSE (HAVE_BOOST_THREAD)
+              MESSAGE (STATUS "PlayerC++ client library Boost::Thread support disabled - Boost::Thread library not found.")
+          ENDIF (HAVE_BOOST_THREAD)
+  
+          SET (HAVE_BOOST_SIGNALS TRUE INTERNAL)
+          IF (HAVE_BOOST_SIGNALS)
+              OPTION (USE_BOOST_SIGNALS "Use the Boost signalling library" ON)
+              MARK_AS_ADVANCED (USE_BOOST_SIGNALS)
+              IF (USE_BOOST_SIGNALS)
+                  MESSAGE (STATUS "PlayerC++ client library will be built with Boost::Signals support.")
+                  PLAYERCC_ADD_LINK_LIB (boost_signals)
+                  INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS})
+                  LINK_DIRECTORIES (${Boost_LIBRARY_DIRS})
+                  APPEND_TO_CACHED_STRING (PLAYERCC_DEFINITIONS "libplayerc++ defines" -DHAVE_BOOST_SIGNALS)
+                  SET (boostLinkLibs "${boostLinkLibs} -lboost_signals")
+              ELSE (USE_BOOST_SIGNALS)
+                  MESSAGE (STATUS "PlayerC++ client library Boost::Signals support disabled by user.")
+              ENDIF (USE_BOOST_SIGNALS)
+          ELSE (HAVE_BOOST_SIGNALS)
+              MESSAGE (STATUS "PlayerC++ client library Boost::Signals support disabled - Boost::Signals library not found.")
+          ENDIF (HAVE_BOOST_SIGNALS)
+      ELSE (Boost_FOUND)
+          MESSAGE (STATUS "Boost libraries were not found. Boost::Signals and Boost::Thread support will not be included in PlayerC++.")
+      ENDIF (Boost_FOUND)
+    ELSE (BUILD_PLAYERCC_BOOST)
+        MESSAGE (STATUS "Boost support disabled. Boost::Signals and Boost::Thread support will not be included in PlayerC++.")
+    ENDIF (BUILD_PLAYERCC_BOOST)
 
-        SET (HAVE_BOOST_SIGNALS TRUE INTERNAL)
-        IF (HAVE_BOOST_SIGNALS)
-            OPTION (USE_BOOST_SIGNALS "Use the Boost signalling library" ON)
-            MARK_AS_ADVANCED (USE_BOOST_SIGNALS)
-            IF (USE_BOOST_SIGNALS)
-                MESSAGE (STATUS "PlayerC++ client library will be built with Boost::Signals support.")
-                PLAYERCC_ADD_LINK_LIB (boost_signals)
-                INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS})
-                LINK_DIRECTORIES (${Boost_LIBRARY_DIRS})
-                APPEND_TO_CACHED_STRING (PLAYERCC_DEFINITIONS "libplayerc++ defines" -DHAVE_BOOST_SIGNALS)
-                SET (boostLinkLibs "${boostLinkLibs} -lboost_signals")
-            ELSE (USE_BOOST_SIGNALS)
-                MESSAGE (STATUS "PlayerC++ client library Boost::Signals support disabled by user.")
-            ENDIF (USE_BOOST_SIGNALS)
-        ELSE (HAVE_BOOST_SIGNALS)
-            MESSAGE (STATUS "PlayerC++ client library Boost::Signals support disabled - Boost::Signals library not found.")
-        ENDIF (HAVE_BOOST_SIGNALS)
-    ELSE (Boost_FOUND)
-        MESSAGE (STATUS "Boost libraries were not found. Boost::Signals and Boost::Thread support will not be included in PlayerC++.")
-    ENDIF (Boost_FOUND)
-
     INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs)
 
     SET (playerccSrcs   playerc++.h
@@ -103,4 +108,4 @@
     PLAYER_MAKE_PKGCONFIG ("playerc++" "C++ wrapper for libplayerc - part of the Player Project" "playerxdr playerc" "" "" "-lm ${boostLinkLibs}")
 
     PLAYER_INSTALL_HEADERS (playerc++ clientproxy.h playerc++.h playerclient.h playererror.h utility.h)
-ENDIF (BUILD_PLAYERCC)
\ No newline at end of file
+ENDIF (BUILD_PLAYERCC)

Modified: code/player/branches/cmake/examples/libplayerc++/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/examples/libplayerc++/CMakeLists.txt	2008-04-03 20:56:34 UTC (rev 4472)
+++ code/player/branches/cmake/examples/libplayerc++/CMakeLists.txt	2008-04-03 21:37:19 UTC (rev 4473)
@@ -20,16 +20,18 @@
     PLAYERCPP_ADD_EXAMPLE (speech speech.cc)
     PLAYERCPP_ADD_EXAMPLE (wallfollow wallfollow.cc)
 
-    IF (USE_BOOST_THREADS OR USE_BOOST_SIGNALS)
-        PLAYERCPP_ADD_EXAMPLE (example1 example1.cc)
-        PLAYERCPP_ADD_EXAMPLE (example3 example3.cc)
-        PLAYERCPP_ADD_EXAMPLE (goto goto.cc)
-        PLAYERCPP_ADD_EXAMPLE (speech_cpp_client speech_cpp_client.cc)
-    ENDIF (USE_BOOST_THREADS OR USE_BOOST_SIGNALS)
-
-    IF (USE_BOOST_SIGNALS)
-        PLAYERCPP_ADD_EXAMPLE (example2 example2.cc)
-    ENDIF (USE_BOOST_SIGNALS)
+    IF (BUILD_PLAYERCC_BOOST)
+      IF (USE_BOOST_THREADS OR USE_BOOST_SIGNALS)
+          PLAYERCPP_ADD_EXAMPLE (example1 example1.cc)
+          PLAYERCPP_ADD_EXAMPLE (example3 example3.cc)
+          PLAYERCPP_ADD_EXAMPLE (goto goto.cc)
+          PLAYERCPP_ADD_EXAMPLE (speech_cpp_client speech_cpp_client.cc)
+      ENDIF (USE_BOOST_THREADS OR USE_BOOST_SIGNALS)
+  
+      IF (USE_BOOST_SIGNALS)
+          PLAYERCPP_ADD_EXAMPLE (example2 example2.cc)
+      ENDIF (USE_BOOST_SIGNALS)
+    ENDIF (BUILD_PLAYERCC_BOOST)
 ELSE (BUILD_PLAYERCC)
     MESSAGE (STATUS "playerprint will not be built - playerc++ client library is disabled")
-ENDIF (BUILD_PLAYERCC)
\ No newline at end of file
+ENDIF (BUILD_PLAYERCC)

Modified: code/player/branches/cmake/examples/plugins/exampledriver/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/examples/plugins/exampledriver/CMakeLists.txt	2008-04-03 20:56:34 UTC (rev 4472)
+++ code/player/branches/cmake/examples/plugins/exampledriver/CMakeLists.txt	2008-04-03 21:37:19 UTC (rev 4473)
@@ -1 +1,2 @@
-ADD_LIBRARY (exampledriver SHARED exampledriver.cc)
\ No newline at end of file
+ADD_LIBRARY (exampledriver SHARED exampledriver.cc)
+TARGET_LINK_LIBRARIES (exampledriver playercore)

Modified: code/player/branches/cmake/examples/plugins/exampleinterface/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/examples/plugins/exampleinterface/CMakeLists.txt	2008-04-03 20:56:34 UTC (rev 4472)
+++ code/player/branches/cmake/examples/plugins/exampleinterface/CMakeLists.txt	2008-04-03 21:37:19 UTC (rev 4473)
@@ -29,6 +29,8 @@
 
 INCLUDE_DIRECTORIES (${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/client_libs ${CMAKE_CURRENT_BINARY_DIR})
 ADD_LIBRARY (eginterf SHARED ${example_interface_h} ${example_xdr_h} ${example_xdr_c} eginterf_client.c ${example_functiontable_c})
+TARGET_LINK_LIBRARIES (eginterf playerc)
 ADD_LIBRARY (eginterfdriver SHARED ${example_interface_h} ${example_xdr_h} eginterf_driver.cc)
+TARGET_LINK_LIBRARIES (eginterfdriver playercore)
 ADD_EXECUTABLE (example_client example_client.c ${example_interface_h})
-TARGET_LINK_LIBRARIES (example_client playerc playerxdr playererror ${PLAYERC_EXTRA_LINK_LIBRARIES} eginterf)
\ No newline at end of file
+TARGET_LINK_LIBRARIES (example_client playerc playerxdr playererror ${PLAYERC_EXTRA_LINK_LIBRARIES} eginterf)

Modified: code/player/branches/cmake/examples/plugins/multidriver/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/examples/plugins/multidriver/CMakeLists.txt	2008-04-03 20:56:34 UTC (rev 4472)
+++ code/player/branches/cmake/examples/plugins/multidriver/CMakeLists.txt	2008-04-03 21:37:19 UTC (rev 4473)
@@ -1 +1,2 @@
-ADD_LIBRARY (multidriver SHARED multidriver.cc)
\ No newline at end of file
+ADD_LIBRARY (multidriver SHARED multidriver.cc)
+TARGET_LINK_LIBRARIES (multidriver playercore)

Modified: code/player/branches/cmake/examples/plugins/opaquedriver/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/examples/plugins/opaquedriver/CMakeLists.txt	2008-04-03 20:56:34 UTC (rev 4472)
+++ code/player/branches/cmake/examples/plugins/opaquedriver/CMakeLists.txt	2008-04-03 21:37:19 UTC (rev 4473)
@@ -1,5 +1,6 @@
 ADD_LIBRARY (opaquedriver SHARED opaquedriver.cc)
+TARGET_LINK_LIBRARIES (opaquedriver playercore)
 
 INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs)
 ADD_EXECUTABLE (opaque_client opaque.c)
-TARGET_LINK_LIBRARIES (opaque_client playerc playerxdr playererror ${PLAYERC_EXTRA_LINK_LIBRARIES})
\ No newline at end of file
+TARGET_LINK_LIBRARIES (opaque_client playerc playerxdr playererror ${PLAYERC_EXTRA_LINK_LIBRARIES})

Modified: code/player/branches/cmake/libplayercore/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/libplayercore/CMakeLists.txt	2008-04-03 20:56:34 UTC (rev 4472)
+++ code/player/branches/cmake/libplayercore/CMakeLists.txt	2008-04-03 21:37:19 UTC (rev 4473)
@@ -36,7 +36,11 @@
                         globals.cc
                         property.cpp)
 PLAYER_ADD_LIBRARY (playercore ${playercore_srcs} ${player_interfaces_h} ${playerxdr_h})
-TARGET_LINK_LIBRARIES (playercore ltdl dl pthread)
+# TODO: playerxdr should NOT be linked here; it's a bogus dependency coming
+# from the fact that message cloning functions are auto-generated into
+# playerxdr and used here.  Those functions should go into a separate
+# library.
+TARGET_LINK_LIBRARIES (playercore playerutils playererror playerxdr ltdl dl pthread)
 PLAYER_ADD_LINK_LIB (ltdl dl pthread)
 PLAYER_MAKE_PKGCONFIG ("playercore" "Player core library - part of the Player Project" "playererror" "" "" "-lltdl -lpthread")
 
@@ -49,9 +53,10 @@
 SET (playerutils_srcs   interface_util.c
                         addr_util.c)
 PLAYER_ADD_LIBRARY (playerutils ${playerutils_srcs} ${interface_table_h})
+TARGET_LINK_LIBRARIES (playerutils playererror)
 PLAYER_MAKE_PKGCONFIG ("playerutils" "Player utilities library - part of the Player Project" "" "" "" "")
 
 PLAYER_INSTALL_HEADERS (playercore
     addr_util.h configfile.h device.h devicetable.h driver.h drivertable.h error.h globals.h
     interface_util.h message.h playercommon.h playerconfig.h playercore.h player.h
-    ${player_interfaces_h} playertime.h plugins.h property.h wallclocktime.h)
\ No newline at end of file
+    ${player_interfaces_h} playertime.h plugins.h property.h wallclocktime.h)

Modified: code/player/branches/cmake/libplayertcp/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/libplayertcp/CMakeLists.txt	2008-04-03 20:56:34 UTC (rev 4472)
+++ code/player/branches/cmake/libplayertcp/CMakeLists.txt	2008-04-03 21:37:19 UTC (rev 4473)
@@ -20,7 +20,8 @@
     SET (playerudpSrcs playerudp.cc)
     PLAYER_ADD_LIBRARY (playerudp ${playerudpSrcs})
     TARGET_LINK_LIBRARIES (playerudp replace playercore playererror playerutils playerxdr)
+    TARGET_LINK_LIBRARIES (playerudp z)
     PLAYER_MAKE_PKGCONFIG ("playerudp" "Player UDP messaging library - part of the Player Project" "playererror playercore" "" "" "")
 
     PLAYER_INSTALL_HEADERS (playertcp playerudp.h)
-ENDIF (INCLUDE_UDP)
\ No newline at end of file
+ENDIF (INCLUDE_UDP)

Modified: code/player/branches/cmake/utils/pmap/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/utils/pmap/CMakeLists.txt	2008-04-03 20:56:34 UTC (rev 4472)
+++ code/player/branches/cmake/utils/pmap/CMakeLists.txt	2008-04-03 21:37:19 UTC (rev 4473)
@@ -9,7 +9,7 @@
 
 IF (haveGSL)
     SET (pmapSrcs logfile.cpp omap.cpp pmap.cpp rmap.cpp slap.cpp)
-    SET (lodoSrcs lodo.cpp)
+    SET (lodoSrcs lodo.cpp slap.cpp)
     SET (pmaptestSrcs pmap_test.cpp)
     SET (lododriverSrcs lodo_driver.cc)
 
@@ -23,8 +23,11 @@
     PLAYER_ADD_LIBRARY (pmap ${pmapSrcs})
     SET_SOURCE_FILES_PROPERTIES (${pmapSrcs} PROPERTIES
         COMPILE_FLAGS "${gslCFlags} --fast-math")
+    SET_TARGET_PROPERTIES (pmap PROPERTIES
+        LINK_FLAGS "${gslLinkFlags}")
 
     PLAYER_ADD_LIBRARY (lodo ${lodoSrcs})
+    TARGET_LINK_LIBRARIES (lodo playercore)
     SET_SOURCE_FILES_PROPERTIES (${lodoSrcs} PROPERTIES
         COMPILE_FLAGS "${gslCFlags} --fast-math")
     SET_TARGET_PROPERTIES (lodo PROPERTIES
@@ -34,4 +37,4 @@
     TARGET_LINK_LIBRARIES (lododriver lodo)
 ELSE (haveGSL)
     MESSAGE (STATUS "pmap utilities will not be built - GSL not found")
-ENDIF (haveGSL)
\ No newline at end of file
+ENDIF (haveGSL)


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