Revision: 4476
http://playerstage.svn.sourceforge.net/playerstage/?rev=4476&view=rev
Author: gbiggs
Date: 2008-04-03 20:48:10 -0700 (Thu, 03 Apr 2008)
Log Message:
-----------
Fixed some dependency issues when building static libraries.
Modified Paths:
--------------
code/player/branches/cmake/CMake_Todo.txt
code/player/branches/cmake/client_libs/libplayerc/CMakeLists.txt
code/player/branches/cmake/libplayercore/CMakeLists.txt
code/player/branches/cmake/libplayerxdr/CMakeLists.txt
Modified: code/player/branches/cmake/CMake_Todo.txt
===================================================================
--- code/player/branches/cmake/CMake_Todo.txt 2008-04-04 03:18:13 UTC (rev
4475)
+++ code/player/branches/cmake/CMake_Todo.txt 2008-04-04 03:48:10 UTC (rev
4476)
@@ -9,4 +9,5 @@
. Fix the checks for boost threads and boost signals libraries - possibly a
better version of FindBoost is coming in 2.6, defer till then
(http://www.cmake.org/Bug/view.php?id=6257)
- Some installable cmake modules with macros for making plugin drivers, etc
- Clean out/replace any stragglers from autotools (including README and co)
-- Drivers being disabled by a check used to correctly force their option to
off. Figure out why this broke. Fix it.
\ No newline at end of file
+- Drivers being disabled by a check used to correctly force their option to
off. Figure out why this broke. Fix it.
+- Figure out why C++ tests and C++ examples don't link properly when building
as static libs, even though the server and utils do.
\ No newline at end of file
Modified: code/player/branches/cmake/client_libs/libplayerc/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/client_libs/libplayerc/CMakeLists.txt
2008-04-04 03:18:13 UTC (rev 4475)
+++ code/player/branches/cmake/client_libs/libplayerc/CMakeLists.txt
2008-04-04 03:48:10 UTC (rev 4476)
@@ -1,5 +1,4 @@
ADD_SUBDIRECTORY (bindings)
-# ADD_SUBDIRECTORY (doc)
INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/client_libs)
@@ -53,6 +52,7 @@
APPEND_TO_CACHED_LIST (PLAYERC_EXTRA_LINK_LIBRARIES "Libs to link to with
playerc" z m)
PLAYER_ADD_LIBRARY (playerc ${playercSrcs})
+ADD_DEPENDENCIES (playerc player_interfaces playerxdr_src)
TARGET_LINK_LIBRARIES (playerc playerxdr playerutils playererror
${PLAYERC_EXTRA_LINK_LIBRARIES})
IF (HAVE_LIBJPEG)
TARGET_LINK_LIBRARIES (playerc playerjpeg)
Modified: code/player/branches/cmake/libplayercore/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/libplayercore/CMakeLists.txt 2008-04-04
03:18:13 UTC (rev 4475)
+++ code/player/branches/cmake/libplayercore/CMakeLists.txt 2008-04-04
03:48:10 UTC (rev 4476)
@@ -9,7 +9,13 @@
SET (player_interfaces_h "${CMAKE_CURRENT_BINARY_DIR}/player_interfaces.h")
SET (interface_table_h "${CMAKE_CURRENT_BINARY_DIR}/interface_table.h")
PROCESS_INTERFACES ("" ${CMAKE_CURRENT_SOURCE_DIR}/interfaces
${player_interfaces_h})
+ADD_CUSTOM_TARGET (player_interfaces ALL
+ DEPENDS ${player_interfaces_h}
+ COMMENT "Generating player_interfaces.h")
PROCESS_INTERFACES ("--utils" ${CMAKE_CURRENT_SOURCE_DIR}/interfaces
${interface_table_h} ${player_interfaces_h})
+ADD_CUSTOM_TARGET (interface_table ALL
+ DEPENDS ${interface_table_h}
+ COMMENT "Generating interface_table.h")
# For now, we're generating our own copy of playerxdr.h (and .c as a
side-effect) here.
# This can be fixed when the cross-directory dependency with libplayerxdr is
removed.
Modified: code/player/branches/cmake/libplayerxdr/CMakeLists.txt
===================================================================
--- code/player/branches/cmake/libplayerxdr/CMakeLists.txt 2008-04-04
03:18:13 UTC (rev 4475)
+++ code/player/branches/cmake/libplayerxdr/CMakeLists.txt 2008-04-04
03:48:10 UTC (rev 4476)
@@ -18,6 +18,9 @@
DEPENDS ${interfaceFiles} ${player_interfaces_h}
VERBATIM
)
+ADD_CUSTOM_TARGET (playerxdr_src ALL
+ DEPENDS ${playerxdr_h} ${playerxdr_c}
+ COMMENT "Generating playerxdr.?")
SET (functiontable_gen_h "${CMAKE_CURRENT_BINARY_DIR}/functiontable_gen.h")
ADD_CUSTOM_COMMAND (OUTPUT ${functiontable_gen_h}
@@ -26,6 +29,9 @@
DEPENDS ${interfaceFiles}
VERBATIM
)
+ADD_CUSTOM_TARGET (functiontable_gen ALL
+ DEPENDS ${functiontable_gen_h}
+ COMMENT "Generating functiontable_gen.h")
SET (playerxdrSrcs ${playerxdr_h}
${playerxdr_c}
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
