Revision: 7071
http://playerstage.svn.sourceforge.net/playerstage/?rev=7071&view=rev
Author: gbiggs
Date: 2008-10-07 01:21:02 +0000 (Tue, 07 Oct 2008)
Log Message:
-----------
Added individual build options for the utils
Modified Paths:
--------------
code/player/trunk/utils/logsplitter/CMakeLists.txt
code/player/trunk/utils/playercam/CMakeLists.txt
code/player/trunk/utils/playerjoy/CMakeLists.txt
code/player/trunk/utils/playernav/CMakeLists.txt
code/player/trunk/utils/playerprint/CMakeLists.txt
code/player/trunk/utils/playerprop/CMakeLists.txt
code/player/trunk/utils/playerv/CMakeLists.txt
code/player/trunk/utils/playervcr/CMakeLists.txt
code/player/trunk/utils/playerwritemap/CMakeLists.txt
code/player/trunk/utils/pmap/CMakeLists.txt
code/player/trunk/utils/xmms-plugin/CMakeLists.txt
Modified: code/player/trunk/utils/logsplitter/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/logsplitter/CMakeLists.txt 2008-10-07 01:06:39 UTC
(rev 7070)
+++ code/player/trunk/utils/logsplitter/CMakeLists.txt 2008-10-07 01:21:02 UTC
(rev 7071)
@@ -1,2 +1,5 @@
-PLAYER_ADD_EXECUTABLE (playerlogsplitter logsplitter.c)
-# Wow, that one was easy!
\ No newline at end of file
+OPTION (BUILD_UTILS_LOGSPLITTER "Build the logsplitter utility" ON)
+IF (BUILD_UTILS_LOGSPLITTER)
+ PLAYER_ADD_EXECUTABLE (playerlogsplitter logsplitter.c)
+ # Wow, that one was easy!
+ENDIF (BUILD_UTILS_LOGSPLITTER)
Modified: code/player/trunk/utils/playercam/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/playercam/CMakeLists.txt 2008-10-07 01:06:39 UTC
(rev 7070)
+++ code/player/trunk/utils/playercam/CMakeLists.txt 2008-10-07 01:21:02 UTC
(rev 7071)
@@ -1,17 +1,20 @@
-IF (WITH_GTK AND WITH_GDKPIXBUF)
- SET (playercamSrcs playercam.c)
+OPTION (BUILD_UTILS_PLAYERCAM "Build the playercam utility" ON)
+IF (BUILD_UTILS_PLAYERCAM)
+ IF (WITH_GTK AND WITH_GDKPIXBUF)
+ SET (playercamSrcs playercam.c)
- INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs ${GTK_INCLUDEDIR})
- PLAYER_ADD_EXECUTABLE (playercam ${playercamSrcs})
- TARGET_LINK_LIBRARIES (playercam playerc playerxdr playererror
${PLAYERC_EXTRA_LINK_LIBRARIES})
- SET_SOURCE_FILES_PROPERTIES (${playercamSrcs} PROPERTIES
- COMPILE_FLAGS "${GTK_CFLAGS}")
- SET_TARGET_PROPERTIES (playercam PROPERTIES
- LINK_FLAGS "${GTK_LINKFLAGS}")
-ELSE (WITH_GTK AND WITH_GDKPIXBUF)
- IF (NOT WITH_GTK)
- MESSAGE (STATUS "playercam will not be built - GTK not found")
- ELSE (NOT WITH_GTK)
- MESSAGE (STATUS "playercam will not be built - GDK pixbuf not found")
- ENDIF (NOT WITH_GTK)
-ENDIF (WITH_GTK AND WITH_GDKPIXBUF)
+ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs
${GTK_INCLUDEDIR})
+ PLAYER_ADD_EXECUTABLE (playercam ${playercamSrcs})
+ TARGET_LINK_LIBRARIES (playercam playerc playerxdr playererror
${PLAYERC_EXTRA_LINK_LIBRARIES})
+ SET_SOURCE_FILES_PROPERTIES (${playercamSrcs} PROPERTIES
+ COMPILE_FLAGS "${GTK_CFLAGS}")
+ SET_TARGET_PROPERTIES (playercam PROPERTIES
+ LINK_FLAGS "${GTK_LINKFLAGS}")
+ ELSE (WITH_GTK AND WITH_GDKPIXBUF)
+ IF (NOT WITH_GTK)
+ MESSAGE (STATUS "playercam will not be built - GTK not found")
+ ELSE (NOT WITH_GTK)
+ MESSAGE (STATUS "playercam will not be built - GDK pixbuf not
found")
+ ENDIF (NOT WITH_GTK)
+ ENDIF (WITH_GTK AND WITH_GDKPIXBUF)
+ENDIF (BUILD_UTILS_PLAYERCAM)
Modified: code/player/trunk/utils/playerjoy/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/playerjoy/CMakeLists.txt 2008-10-07 01:06:39 UTC
(rev 7070)
+++ code/player/trunk/utils/playerjoy/CMakeLists.txt 2008-10-07 01:21:02 UTC
(rev 7071)
@@ -1,8 +1,11 @@
-IF (BUILD_PLAYERCC)
- INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs
${PROJECT_BINARY_DIR}/client_libs)
+OPTION (BUILD_UTILS_PLAYERJOY "Build the playerjoy utility" ON)
+IF (BUILD_UTILS_PLAYERJOY)
+ IF (BUILD_PLAYERCC)
+ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs
${PROJECT_BINARY_DIR}/client_libs)
- PLAYER_ADD_EXECUTABLE (playerjoy playerjoy.cc)
- TARGET_LINK_LIBRARIES (playerjoy playerc++ playerc playerxdr playererror
${PLAYERC_EXTRA_LINK_LIBRARIES} ${PLAYERCC_EXTRA_LINK_LIBRARIES} pthread)
-ELSE (BUILD_PLAYERCC)
- MESSAGE (STATUS "playerjoy will not be built - playerc++ client library is
disabled")
-ENDIF (BUILD_PLAYERCC)
\ No newline at end of file
+ PLAYER_ADD_EXECUTABLE (playerjoy playerjoy.cc)
+ TARGET_LINK_LIBRARIES (playerjoy playerc++ playerc playerxdr
playererror ${PLAYERC_EXTRA_LINK_LIBRARIES} ${PLAYERCC_EXTRA_LINK_LIBRARIES}
pthread)
+ ELSE (BUILD_PLAYERCC)
+ MESSAGE (STATUS "playerjoy will not be built - playerc++ client
library is disabled")
+ ENDIF (BUILD_PLAYERCC)
+ENDIF (BUILD_UTILS_PLAYERJOY)
Modified: code/player/trunk/utils/playernav/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/playernav/CMakeLists.txt 2008-10-07 01:06:39 UTC
(rev 7070)
+++ code/player/trunk/utils/playernav/CMakeLists.txt 2008-10-07 01:21:02 UTC
(rev 7071)
@@ -1,13 +1,16 @@
-IF (WITH_GNOMECANVAS)
- SET (playernavSrcs playernav.c gui.c player.c parse.c)
+OPTION (BUILD_UTILS_PLAYERNAV "Build the playernav utility" ON)
+IF (BUILD_UTILS_PLAYERNAV)
+ IF (WITH_GNOMECANVAS)
+ SET (playernavSrcs playernav.c gui.c player.c parse.c)
- INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs ${GTK_INCLUDEDIR})
- PLAYER_ADD_EXECUTABLE (playernav ${playernavSrcs})
- TARGET_LINK_LIBRARIES (playernav playerc playerxdr playererror
${PLAYERC_EXTRA_LINK_LIBRARIES})
- SET_SOURCE_FILES_PROPERTIES (${playernavSrcs} PROPERTIES
- COMPILE_FLAGS "${GNOMECANVAS_CFLAGS}")
- SET_TARGET_PROPERTIES (playernav PROPERTIES
- LINK_FLAGS "${GNOMECANVAS_LINKFLAGS}")
-ELSE (WITH_GNOMECANVAS)
- MESSAGE (STATUS "playernav will not be built - Gnome Canvas not found")
-ENDIF (WITH_GNOMECANVAS)
\ No newline at end of file
+ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs
${GTK_INCLUDEDIR})
+ PLAYER_ADD_EXECUTABLE (playernav ${playernavSrcs})
+ TARGET_LINK_LIBRARIES (playernav playerc playerxdr playererror
${PLAYERC_EXTRA_LINK_LIBRARIES})
+ SET_SOURCE_FILES_PROPERTIES (${playernavSrcs} PROPERTIES
+ COMPILE_FLAGS "${GNOMECANVAS_CFLAGS}")
+ SET_TARGET_PROPERTIES (playernav PROPERTIES
+ LINK_FLAGS "${GNOMECANVAS_LINKFLAGS}")
+ ELSE (WITH_GNOMECANVAS)
+ MESSAGE (STATUS "playernav will not be built - Gnome Canvas not found")
+ ENDIF (WITH_GNOMECANVAS)
+ENDIF (BUILD_UTILS_PLAYERNAV)
Modified: code/player/trunk/utils/playerprint/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/playerprint/CMakeLists.txt 2008-10-07 01:06:39 UTC
(rev 7070)
+++ code/player/trunk/utils/playerprint/CMakeLists.txt 2008-10-07 01:21:02 UTC
(rev 7071)
@@ -1,9 +1,12 @@
-IF (BUILD_PLAYERCC)
- INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs
${PROJECT_BINARY_DIR}/client_libs)
+OPTION (BUILD_UTILS_PLAYERPRINT "Build the playerprint utility" ON)
+IF (BUILD_UTILS_PLAYERPRINT)
+ IF (BUILD_PLAYERCC)
+ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs
${PROJECT_BINARY_DIR}/client_libs)
- ADD_DEFINITIONS (${PLAYERCC_DEFINITIONS})
- PLAYER_ADD_EXECUTABLE (playerprint playerprint.cc)
- TARGET_LINK_LIBRARIES (playerprint playerc++ playerc playerxdr playererror
${PLAYERC_EXTRA_LINK_LIBRARIES} ${PLAYERCC_EXTRA_LINK_LIBRARIES})
-ELSE (BUILD_PLAYERCC)
- MESSAGE (STATUS "playerprint will not be built - playerc++ client library
is disabled")
-ENDIF (BUILD_PLAYERCC)
\ No newline at end of file
+ ADD_DEFINITIONS (${PLAYERCC_DEFINITIONS})
+ PLAYER_ADD_EXECUTABLE (playerprint playerprint.cc)
+ TARGET_LINK_LIBRARIES (playerprint playerc++ playerc playerxdr
playererror ${PLAYERC_EXTRA_LINK_LIBRARIES} ${PLAYERCC_EXTRA_LINK_LIBRARIES})
+ ELSE (BUILD_PLAYERCC)
+ MESSAGE (STATUS "playerprint will not be built - playerc++ client
library is disabled")
+ ENDIF (BUILD_PLAYERCC)
+ENDIF (BUILD_UTILS_PLAYERPRINT)
Modified: code/player/trunk/utils/playerprop/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/playerprop/CMakeLists.txt 2008-10-07 01:06:39 UTC
(rev 7070)
+++ code/player/trunk/utils/playerprop/CMakeLists.txt 2008-10-07 01:21:02 UTC
(rev 7071)
@@ -1,8 +1,11 @@
-IF (BUILD_PLAYERCC)
- INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs
${PROJECT_BINARY_DIR}/client_libs)
+OPTION (BUILD_UTILS_PLAYERPROP "Build the playerprop utility" ON)
+IF (BUILD_UTILS_PLAYERPROP)
+ IF (BUILD_PLAYERCC)
+ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs
${PROJECT_BINARY_DIR}/client_libs)
- PLAYER_ADD_EXECUTABLE (playerprop playerprop.cpp)
- TARGET_LINK_LIBRARIES (playerprop playerc++ playerc playerxdr playererror
${PLAYERC_EXTRA_LINK_LIBRARIES} ${PLAYERCC_EXTRA_LINK_LIBRARIES})
-ELSE (BUILD_PLAYERCC)
- MESSAGE (STATUS "playerprop will not be built - playerc++ client library
is disabled")
-ENDIF (BUILD_PLAYERCC)
\ No newline at end of file
+ PLAYER_ADD_EXECUTABLE (playerprop playerprop.cpp)
+ TARGET_LINK_LIBRARIES (playerprop playerc++ playerc playerxdr
playererror ${PLAYERC_EXTRA_LINK_LIBRARIES} ${PLAYERCC_EXTRA_LINK_LIBRARIES})
+ ELSE (BUILD_PLAYERCC)
+ MESSAGE (STATUS "playerprop will not be built - playerc++ client
library is disabled")
+ ENDIF (BUILD_PLAYERCC)
+ENDIF (BUILD_UTILS_PLAYERPROP)
Modified: code/player/trunk/utils/playerv/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/playerv/CMakeLists.txt 2008-10-07 01:06:39 UTC
(rev 7070)
+++ code/player/trunk/utils/playerv/CMakeLists.txt 2008-10-07 01:21:02 UTC
(rev 7071)
@@ -1,40 +1,43 @@
-IF (WITH_GTK AND INCLUDE_RTK)
- SET (playervSrcs playerv.c
- playerv.h
- registry.c
- mainwnd.c
- error.h
- opt.c
- opt.h
- pv_dev_actarray.c
- pv_dev_aio.c
- pv_dev_blobfinder.c
- pv_dev_camera.c
- pv_dev_bumper.c
- pv_dev_dio.c
- pv_dev_fiducial.c
- pv_dev_ir.c
- pv_dev_laser.c
- pv_dev_map.c
- pv_dev_position2d.c
- pv_dev_power.c
- pv_dev_ptz.c
- pv_dev_sonar.c
- pv_dev_wifi.c
- pv_dev_gripper.c
- pv_dev_ranger.c
- pv_dev_vectormap.c)
+OPTION (BUILD_UTILS_PLAYERV "Build the playerv utility" ON)
+IF (BUILD_UTILS_PLAYERV)
+ IF (WITH_GTK AND INCLUDE_RTK)
+ SET (playervSrcs playerv.c
+ playerv.h
+ registry.c
+ mainwnd.c
+ error.h
+ opt.c
+ opt.h
+ pv_dev_actarray.c
+ pv_dev_aio.c
+ pv_dev_blobfinder.c
+ pv_dev_camera.c
+ pv_dev_bumper.c
+ pv_dev_dio.c
+ pv_dev_fiducial.c
+ pv_dev_ir.c
+ pv_dev_laser.c
+ pv_dev_map.c
+ pv_dev_position2d.c
+ pv_dev_power.c
+ pv_dev_ptz.c
+ pv_dev_sonar.c
+ pv_dev_wifi.c
+ pv_dev_gripper.c
+ pv_dev_ranger.c
+ pv_dev_vectormap.c)
- INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs ${GTK_INCLUDEDIR})
- PLAYER_ADD_EXECUTABLE (playerv ${playervSrcs})
- TARGET_LINK_LIBRARIES (playerv playerc playerxdr playererror playerutils
rtk ${PLAYERC_EXTRA_LINK_LIBRARIES})
- IF (PLAYER_OS_SOLARIS)
- TARGET_LINK_LIBRARIES (playerv rt)
- ENDIF (PLAYER_OS_SOLARIS)
- SET_SOURCE_FILES_PROPERTIES (${playervSrcs} PROPERTIES
- COMPILE_FLAGS "${GTK_CFLAGS}")
- SET_TARGET_PROPERTIES (playerv PROPERTIES
- LINK_FLAGS "${GTK_LINKFLAGS}")
-ELSE (WITH_GTK AND INCLUDE_RTK)
- MESSAGE (STATUS "playerv will not be built - GTK not found or RTK
disabled.")
-ENDIF (WITH_GTK AND INCLUDE_RTK)
\ No newline at end of file
+ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs
${GTK_INCLUDEDIR})
+ PLAYER_ADD_EXECUTABLE (playerv ${playervSrcs})
+ TARGET_LINK_LIBRARIES (playerv playerc playerxdr playererror
playerutils rtk ${PLAYERC_EXTRA_LINK_LIBRARIES})
+ IF (PLAYER_OS_SOLARIS)
+ TARGET_LINK_LIBRARIES (playerv rt)
+ ENDIF (PLAYER_OS_SOLARIS)
+ SET_SOURCE_FILES_PROPERTIES (${playervSrcs} PROPERTIES
+ COMPILE_FLAGS "${GTK_CFLAGS}")
+ SET_TARGET_PROPERTIES (playerv PROPERTIES
+ LINK_FLAGS "${GTK_LINKFLAGS}")
+ ELSE (WITH_GTK AND INCLUDE_RTK)
+ MESSAGE (STATUS "playerv will not be built - GTK not found or RTK
disabled.")
+ ENDIF (WITH_GTK AND INCLUDE_RTK)
+ENDIF (BUILD_UTILS_PLAYERV)
Modified: code/player/trunk/utils/playervcr/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/playervcr/CMakeLists.txt 2008-10-07 01:06:39 UTC
(rev 7070)
+++ code/player/trunk/utils/playervcr/CMakeLists.txt 2008-10-07 01:21:02 UTC
(rev 7071)
@@ -1,13 +1,16 @@
-IF (WITH_GTK)
- SET (playervcrSrcs playervcr.c)
+OPTION (BUILD_UTILS_PLAYERVCR "Build the playervcr utility" ON)
+IF (BUILD_UTILS_PLAYERVCR)
+ IF (WITH_GTK)
+ SET (playervcrSrcs playervcr.c)
- INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs ${GTK_INCLUDEDIR})
- PLAYER_ADD_EXECUTABLE (playervcr ${playervcrSrcs})
- TARGET_LINK_LIBRARIES (playervcr playerc playerxdr playererror playerutils
${PLAYERC_EXTRA_LINK_LIBRARIES})
- SET_SOURCE_FILES_PROPERTIES (${playervcrSrcs} PROPERTIES
- COMPILE_FLAGS "${GTK_CFLAGS}")
- SET_TARGET_PROPERTIES (playervcr PROPERTIES
- LINK_FLAGS "${GTK_LINKFLAGS}")
-ELSE (WITH_GTK)
- MESSAGE (STATUS "playervcr will not be built - GTK not found")
-ENDIF (WITH_GTK)
\ No newline at end of file
+ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs
${GTK_INCLUDEDIR})
+ PLAYER_ADD_EXECUTABLE (playervcr ${playervcrSrcs})
+ TARGET_LINK_LIBRARIES (playervcr playerc playerxdr playererror
playerutils ${PLAYERC_EXTRA_LINK_LIBRARIES})
+ SET_SOURCE_FILES_PROPERTIES (${playervcrSrcs} PROPERTIES
+ COMPILE_FLAGS "${GTK_CFLAGS}")
+ SET_TARGET_PROPERTIES (playervcr PROPERTIES
+ LINK_FLAGS "${GTK_LINKFLAGS}")
+ ELSE (WITH_GTK)
+ MESSAGE (STATUS "playervcr will not be built - GTK not found")
+ ENDIF (WITH_GTK)
+ENDIF (BUILD_UTILS_PLAYERVCR)
Modified: code/player/trunk/utils/playerwritemap/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/playerwritemap/CMakeLists.txt 2008-10-07
01:06:39 UTC (rev 7070)
+++ code/player/trunk/utils/playerwritemap/CMakeLists.txt 2008-10-07
01:21:02 UTC (rev 7071)
@@ -1,13 +1,16 @@
-IF (WITH_GDKPIXBUF)
- SET (playerwritemapSrcs playerwritemap.c)
+OPTION (BUILD_UTILS_PLAYERWRITEMAP "Build the playerwritemap utility" ON)
+IF (BUILD_UTILS_PLAYERWRITEMAP)
+ IF (WITH_GDKPIXBUF)
+ SET (playerwritemapSrcs playerwritemap.c)
- INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs ${GTK_INCLUDEDIR})
- PLAYER_ADD_EXECUTABLE (playerwritemap ${playerwritemapSrcs})
- TARGET_LINK_LIBRARIES (playerwritemap playerc playerxdr playererror
playerutils ${PLAYERC_EXTRA_LINK_LIBRARIES})
- SET_SOURCE_FILES_PROPERTIES (${playerwritemapSrcs} PROPERTIES
- COMPILE_FLAGS "${GTK_CFLAGS}")
- SET_TARGET_PROPERTIES (playerwritemap PROPERTIES
- LINK_FLAGS "${GTK_LINKFLAGS}")
-ELSE (WITH_GDKPIXBUF)
- MESSAGE (STATUS "playerwritemap will not be built - GDK pixbuf not found")
-ENDIF (WITH_GDKPIXBUF)
\ No newline at end of file
+ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs
${GTK_INCLUDEDIR})
+ PLAYER_ADD_EXECUTABLE (playerwritemap ${playerwritemapSrcs})
+ TARGET_LINK_LIBRARIES (playerwritemap playerc playerxdr playererror
playerutils ${PLAYERC_EXTRA_LINK_LIBRARIES})
+ SET_SOURCE_FILES_PROPERTIES (${playerwritemapSrcs} PROPERTIES
+ COMPILE_FLAGS "${GTK_CFLAGS}")
+ SET_TARGET_PROPERTIES (playerwritemap PROPERTIES
+ LINK_FLAGS "${GTK_LINKFLAGS}")
+ ELSE (WITH_GDKPIXBUF)
+ MESSAGE (STATUS "playerwritemap will not be built - GDK pixbuf not
found")
+ ENDIF (WITH_GDKPIXBUF)
+ENDIF (BUILD_UTILS_PLAYERWRITEMAP)
Modified: code/player/trunk/utils/pmap/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/pmap/CMakeLists.txt 2008-10-07 01:06:39 UTC (rev
7070)
+++ code/player/trunk/utils/pmap/CMakeLists.txt 2008-10-07 01:21:02 UTC (rev
7071)
@@ -1,66 +1,69 @@
-INCLUDE (${PLAYER_CMAKE_DIR}/PlayerUtils.cmake)
+OPTION (BUILD_UTILS_PMAP "Build the pmap utility" ON)
+IF (BUILD_UTILS_PMAP)
+ INCLUDE (${PLAYER_CMAKE_DIR}/PlayerUtils.cmake)
-INCLUDE (FindPkgConfig)
-IF (NOT PKG_CONFIG_FOUND)
- MESSAGE (STATUS "WARNING: Could not find pkg-config; cannot build pmap
utility.")
-ELSE (NOT PKG_CONFIG_FOUND)
- pkg_check_modules (GSL_PKG gsl)
+ INCLUDE (FindPkgConfig)
+ IF (NOT PKG_CONFIG_FOUND)
+ MESSAGE (STATUS "WARNING: Could not find pkg-config; cannot build pmap
utility.")
+ ELSE (NOT PKG_CONFIG_FOUND)
+ pkg_check_modules (GSL_PKG gsl)
- IF (GSL_PKG_FOUND)
- LIST_TO_STRING (GSL_CFLAGS "${GSL_PKG_CFLAGS}")
- LIST_TO_STRING (GSL_LDFLAGS "${GSL_PKG_LDFLAGS}")
+ IF (GSL_PKG_FOUND)
+ LIST_TO_STRING (GSL_CFLAGS "${GSL_PKG_CFLAGS}")
+ LIST_TO_STRING (GSL_LDFLAGS "${GSL_PKG_LDFLAGS}")
- INCLUDE (FindOpenGL)
- INCLUDE (FindGLUT)
+ INCLUDE (FindOpenGL)
+ INCLUDE (FindGLUT)
- SET (pmapconfig_h_in "${CMAKE_CURRENT_SOURCE_DIR}/pmapconfig.h.in")
- SET (pmapconfig_h "${CMAKE_CURRENT_BINARY_DIR}/pmapconfig.h")
- CONFIGURE_FILE (${pmapconfig_h_in} ${pmapconfig_h})
+ SET (pmapconfig_h_in "${CMAKE_CURRENT_SOURCE_DIR}/pmapconfig.h.in")
+ SET (pmapconfig_h "${CMAKE_CURRENT_BINARY_DIR}/pmapconfig.h")
+ CONFIGURE_FILE (${pmapconfig_h_in} ${pmapconfig_h})
- SET (pmapSrcs logfile.cpp omap.cpp pmap.cpp rmap.cpp slap.cpp
${pmapconfig_h})
- SET (lodoSrcs lodo.cpp slap.cpp ${pmapconfig_h})
- SET (pmaptestSrcs pmap_test.cpp ${pmapconfig_h})
- SET (lododriverSrcs lodo_driver.cc)
+ SET (pmapSrcs logfile.cpp omap.cpp pmap.cpp rmap.cpp slap.cpp
${pmapconfig_h})
+ SET (lodoSrcs lodo.cpp slap.cpp ${pmapconfig_h})
+ SET (pmaptestSrcs pmap_test.cpp ${pmapconfig_h})
+ SET (lododriverSrcs lodo_driver.cc)
- INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs
- ${CMAKE_CURRENT_BINARY_DIR})
- IF (GLUT_FOUND)
- INCLUDE_DIRECTORIES (${GLUT_INCLUDE_DIR})
- ENDIF (GLUT_FOUND)
+ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs
+ ${CMAKE_CURRENT_BINARY_DIR})
+ IF (GLUT_FOUND)
+ INCLUDE_DIRECTORIES (${GLUT_INCLUDE_DIR})
+ ENDIF (GLUT_FOUND)
- PLAYER_ADD_EXECUTABLE (pmaptest ${pmaptestSrcs})
- TARGET_LINK_LIBRARIES (pmaptest pmap lodo)
- IF (GLUT_FOUND)
- TARGET_LINK_LIBRARIES (pmaptest ${GLUT_LIBRARIES})
- ENDIF (GLUT_FOUND)
- SET_TARGET_PROPERTIES (pmaptest PROPERTIES
- LINK_FLAGS "${GSL_LDFLAGS}")
+ PLAYER_ADD_EXECUTABLE (pmaptest ${pmaptestSrcs})
+ TARGET_LINK_LIBRARIES (pmaptest pmap lodo)
+ IF (GLUT_FOUND)
+ TARGET_LINK_LIBRARIES (pmaptest ${GLUT_LIBRARIES})
+ ENDIF (GLUT_FOUND)
+ SET_TARGET_PROPERTIES (pmaptest PROPERTIES
+ LINK_FLAGS "${GSL_LDFLAGS}")
- PLAYER_ADD_LIBRARY (pmap ${pmapSrcs})
- IF (GLUT_FOUND)
- TARGET_LINK_LIBRARIES (pmap ${GLUT_LIBRARIES})
- ENDIF (GLUT_FOUND)
- SET_SOURCE_FILES_PROPERTIES (${pmapSrcs} PROPERTIES
- COMPILE_FLAGS "${GSL_CFLAGS} --fast-math")
- SET_TARGET_PROPERTIES (pmap PROPERTIES
- LINK_FLAGS "${GSL_LDFLAGS}")
+ PLAYER_ADD_LIBRARY (pmap ${pmapSrcs})
+ IF (GLUT_FOUND)
+ TARGET_LINK_LIBRARIES (pmap ${GLUT_LIBRARIES})
+ ENDIF (GLUT_FOUND)
+ SET_SOURCE_FILES_PROPERTIES (${pmapSrcs} PROPERTIES
+ COMPILE_FLAGS "${GSL_CFLAGS} --fast-math")
+ SET_TARGET_PROPERTIES (pmap PROPERTIES
+ LINK_FLAGS "${GSL_LDFLAGS}")
- PLAYER_ADD_LIBRARY (lodo ${lodoSrcs})
- TARGET_LINK_LIBRARIES (lodo playercore)
- IF (GLUT_FOUND)
- TARGET_LINK_LIBRARIES (lodo ${GLUT_LIBRARIES})
- ENDIF (GLUT_FOUND)
- SET_SOURCE_FILES_PROPERTIES (${lodoSrcs} PROPERTIES
- COMPILE_FLAGS "${GSL_CFLAGS} --fast-math")
- SET_TARGET_PROPERTIES (lodo PROPERTIES
- LINK_FLAGS "${GSL_LDFLAGS}")
+ PLAYER_ADD_LIBRARY (lodo ${lodoSrcs})
+ TARGET_LINK_LIBRARIES (lodo playercore)
+ IF (GLUT_FOUND)
+ TARGET_LINK_LIBRARIES (lodo ${GLUT_LIBRARIES})
+ ENDIF (GLUT_FOUND)
+ SET_SOURCE_FILES_PROPERTIES (${lodoSrcs} PROPERTIES
+ COMPILE_FLAGS "${GSL_CFLAGS} --fast-math")
+ SET_TARGET_PROPERTIES (lodo PROPERTIES
+ LINK_FLAGS "${GSL_LDFLAGS}")
- PLAYER_ADD_LIBRARY (lododriver ${lododriverSrcs})
- TARGET_LINK_LIBRARIES (lododriver lodo)
- IF (GLUT_FOUND)
- TARGET_LINK_LIBRARIES (lododriver ${GLUT_LIBRARIES})
- ENDIF (GLUT_FOUND)
- ELSE (GSL_PKG_FOUND)
- MESSAGE (STATUS "pmap utilities will not be built - GSL not found")
- ENDIF (GSL_PKG_FOUND)
-ENDIF (NOT PKG_CONFIG_FOUND)
+ PLAYER_ADD_LIBRARY (lododriver ${lododriverSrcs})
+ TARGET_LINK_LIBRARIES (lododriver lodo)
+ IF (GLUT_FOUND)
+ TARGET_LINK_LIBRARIES (lododriver ${GLUT_LIBRARIES})
+ ENDIF (GLUT_FOUND)
+ ELSE (GSL_PKG_FOUND)
+ MESSAGE (STATUS "pmap utilities will not be built - GSL not found")
+ ENDIF (GSL_PKG_FOUND)
+ ENDIF (NOT PKG_CONFIG_FOUND)
+ENDIF (BUILD_UTILS_PMAP)
Modified: code/player/trunk/utils/xmms-plugin/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/xmms-plugin/CMakeLists.txt 2008-10-07 01:06:39 UTC
(rev 7070)
+++ code/player/trunk/utils/xmms-plugin/CMakeLists.txt 2008-10-07 01:21:02 UTC
(rev 7071)
@@ -1,19 +1,22 @@
-# Look for XMMS
-FIND_PROGRAM (XMMS NAMES xmms-config)
-IF (XMMS)
- INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs)
- EXECUTE_PROCESS (COMMAND xmms-config --cflags
- OUTPUT_VARIABLE xmmsCFlags
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- EXECUTE_PROCESS (COMMAND xmms-config --libs
- OUTPUT_VARIABLE xmmsLibs
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- ADD_LIBRARY (playerxmms STATIC playerxmms.c)
- TARGET_LINK_LIBRARIES (playerxmms playerc playerxdr playererror
${PLAYERC_EXTRA_LINK_LIBRARIES})
- SET_SOURCE_FILES_PROPERTIES (playerxmms.c PROPERTIES
- COMPILE_FLAGS "${xmmsCFlags}")
- SET_TARGET_PROPERTIES (playerxmms PROPERTIES
- LINK_FLAGS "${xmmsLibs}")
-ELSE (XMMS)
- MESSAGE (STATUS "XMMS plugin will not be built - XMMS not found")
-ENDIF (XMMS)
\ No newline at end of file
+OPTION (BUILD_UTILS_XMMS "Build the xmms plugin" ON)
+IF (BUILD_UTILS_XMMS)
+ # Look for XMMS
+ FIND_PROGRAM (XMMS NAMES xmms-config)
+ IF (XMMS)
+ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs)
+ EXECUTE_PROCESS (COMMAND xmms-config --cflags
+ OUTPUT_VARIABLE xmmsCFlags
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ EXECUTE_PROCESS (COMMAND xmms-config --libs
+ OUTPUT_VARIABLE xmmsLibs
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ ADD_LIBRARY (playerxmms STATIC playerxmms.c)
+ TARGET_LINK_LIBRARIES (playerxmms playerc playerxdr playererror
${PLAYERC_EXTRA_LINK_LIBRARIES})
+ SET_SOURCE_FILES_PROPERTIES (playerxmms.c PROPERTIES
+ COMPILE_FLAGS "${xmmsCFlags}")
+ SET_TARGET_PROPERTIES (playerxmms PROPERTIES
+ LINK_FLAGS "${xmmsLibs}")
+ ELSE (XMMS)
+ MESSAGE (STATUS "XMMS plugin will not be built - XMMS not found")
+ ENDIF (XMMS)
+ENDIF (BUILD_UTILS_XMMS)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
