Revision: 4475
http://playerstage.svn.sourceforge.net/playerstage/?rev=4475&view=rev
Author: gbiggs
Date: 2008-04-03 20:18:13 -0700 (Thu, 03 Apr 2008)
Log Message:
-----------
Fixed a duplicated source file problem in libplayerdrivers
Modified Paths:
--------------
code/player/branches/cmake/cmake/internal/DriverUtils.cmake
code/player/branches/cmake/cmake/internal/GeneralCompileOptions.cmake
code/player/branches/cmake/cmake/internal/LibraryUtils.cmake
code/player/branches/cmake/server/drivers/camera/1394/CMakeLists.txt
Modified: code/player/branches/cmake/cmake/internal/DriverUtils.cmake
===================================================================
--- code/player/branches/cmake/cmake/internal/DriverUtils.cmake 2008-04-04
00:35:18 UTC (rev 4474)
+++ code/player/branches/cmake/cmake/internal/DriverUtils.cmake 2008-04-04
03:18:13 UTC (rev 4475)
@@ -339,7 +339,13 @@
# Source files go into a map so we can set the cflags on them later on
SET (tempList)
FOREACH (sourceFile ${ARGN})
- LIST (APPEND tempList "${CMAKE_CURRENT_SOURCE_DIR}/${sourceFile}")
+ # If the path begins with a /, it's absolute so add it raw. Otherwise
it's relative so
+ # we need to add a full path to the front to make it absolute.
+ IF (sourceFile MATCHES "^/.*")
+ LIST (APPEND tempList ${sourceFile})
+ ELSE (sourceFile MATCHES "^/.*")
+ LIST (APPEND tempList "${CMAKE_CURRENT_SOURCE_DIR}/${sourceFile}")
+ ENDIF (sourceFile MATCHES "^/.*")
ENDFOREACH (sourceFile ${ARGN})
INSERT_INTO_GLOBAL_MAP (PLAYER_DRIVERSLIB_SOURCES_MAP ${_name}
"${tempList}")
Modified: code/player/branches/cmake/cmake/internal/GeneralCompileOptions.cmake
===================================================================
--- code/player/branches/cmake/cmake/internal/GeneralCompileOptions.cmake
2008-04-04 00:35:18 UTC (rev 4474)
+++ code/player/branches/cmake/cmake/internal/GeneralCompileOptions.cmake
2008-04-04 03:18:13 UTC (rev 4475)
@@ -4,4 +4,6 @@
IF (WITH_GTK)
OPTION (INCLUDE_RTKGUI "Include the RTK GUI in the server." OFF)
-ENDIF (WITH_GTK)
\ No newline at end of file
+ENDIF (WITH_GTK)
+
+OPTION (BUILD_SHARED_LIBS "Build the Player libraries as shared libraries." ON)
\ No newline at end of file
Modified: code/player/branches/cmake/cmake/internal/LibraryUtils.cmake
===================================================================
--- code/player/branches/cmake/cmake/internal/LibraryUtils.cmake
2008-04-04 00:35:18 UTC (rev 4474)
+++ code/player/branches/cmake/cmake/internal/LibraryUtils.cmake
2008-04-04 03:18:13 UTC (rev 4475)
@@ -6,13 +6,13 @@
# Adds a library to be built and installed and sets some common properties on
it.
MACRO (PLAYER_ADD_LIBRARY _name)
# MESSAGE (STATUS "Building library ${name} with sources ${ARGN}")
- ADD_LIBRARY (${_name} SHARED ${ARGN})
+ ADD_LIBRARY (${_name} ${ARGN})
SET_TARGET_PROPERTIES (${_name} PROPERTIES
VERSION ${PLAYER_VERSION}
SOVERSION ${PLAYER_API_VERSION}
INSTALL_RPATH
"${INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/lib"
BUILD_WITH_INSTALL_RPATH TRUE)
- INSTALL (TARGETS ${_name} LIBRARY DESTINATION lib/)
+ INSTALL (TARGETS ${_name} DESTINATION lib/)
ENDMACRO (PLAYER_ADD_LIBRARY)
Modified: code/player/branches/cmake/server/drivers/camera/1394/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/server/drivers/camera/1394/CMakeLists.txt
2008-04-04 00:35:18 UTC (rev 4474)
+++ code/player/branches/cmake/server/drivers/camera/1394/CMakeLists.txt
2008-04-04 03:18:13 UTC (rev 4475)
@@ -1,2 +1,2 @@
PLAYERDRIVER_OPTION (camera1394 build_camera1394 OFF "API version checks are a
mess - will do later")
-PLAYERDRIVER_ADD_DRIVER_SIMPLE (camera1394 build_camera1394 camera1394.cc
../../blobfinder/cmvision/conversions.c)
\ No newline at end of file
+PLAYERDRIVER_ADD_DRIVER_SIMPLE (camera1394 build_camera1394 camera1394.cc
${PROJECT_SOURCE_DIR}/server/drivers/blobfinder/cmvision/conversions.c)
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
