Revision: 6531
http://playerstage.svn.sourceforge.net/playerstage/?rev=6531&view=rev
Author: gbiggs
Date: 2008-06-10 17:57:16 -0700 (Tue, 10 Jun 2008)
Log Message:
-----------
Fixed problem with interface defs not being rebuilt when changed.
Modified Paths:
--------------
code/player/trunk/CMake_Todo.txt
code/player/trunk/cmake/internal/ProcessInterfaces.cmake
code/player/trunk/libplayercore/CMakeLists.txt
Modified: code/player/trunk/CMake_Todo.txt
===================================================================
--- code/player/trunk/CMake_Todo.txt 2008-06-10 22:41:55 UTC (rev 6530)
+++ code/player/trunk/CMake_Todo.txt 2008-06-11 00:57:16 UTC (rev 6531)
@@ -7,4 +7,3 @@
- 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.
- Add CMakeLists equivalent of the wavefront driver's Makefile.test (and get
rid of Makefile.test)
-- Interfaces don't get reprocessed when the .def files change. Probably
because of the glob. Fix this.
Modified: code/player/trunk/cmake/internal/ProcessInterfaces.cmake
===================================================================
--- code/player/trunk/cmake/internal/ProcessInterfaces.cmake 2008-06-10
22:41:55 UTC (rev 6530)
+++ code/player/trunk/cmake/internal/ProcessInterfaces.cmake 2008-06-11
00:57:16 UTC (rev 6531)
@@ -7,10 +7,9 @@
ENDIF (NOT PYTHONINTERP_FOUND)
MACRO (PROCESS_INTERFACES options directory outputFile)
- FILE (GLOB INTERFACE_DEPENDENCIES ${directory}/*.def)
+# FILE (GLOB INTERFACE_DEPENDENCIES ${directory}/*.def)
ADD_CUSTOM_COMMAND (OUTPUT ${outputFile}
COMMAND ${PYTHON_EXECUTABLE}
${PROJECT_SOURCE_DIR}/libplayercore/playerinterfacegen.py ${options}
${directory} > ${outputFile}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DEPENDS ${INTERFACE_DEPENDENCIES} ${ARGN}
- )
+ DEPENDS ${ARGN})
ENDMACRO (PROCESS_INTERFACES outputFile directory)
Modified: code/player/trunk/libplayercore/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayercore/CMakeLists.txt 2008-06-10 22:41:55 UTC
(rev 6530)
+++ code/player/trunk/libplayercore/CMakeLists.txt 2008-06-11 00:57:16 UTC
(rev 6531)
@@ -6,9 +6,25 @@
MESSAGE (FATAL_ERROR "No Python interpreter found. Cannot continue.")
ENDIF (NOT PYTHONINTERP_FOUND)
+SET (interfaceDefs interfaces/001_player.def interfaces/002_power.def
interfaces/003_gripper.def
+ interfaces/004_position2d.def interfaces/005_sonar.def
interfaces/006_laser.def
+ interfaces/007_blobfinder.def interfaces/008_ptz.def
interfaces/009_audio.def
+ interfaces/010_fiducial.def interfaces/012_speech.def
interfaces/013_gps.def
+ interfaces/014_bumper.def interfaces/020_dio.def
interfaces/021_aio.def
+ interfaces/022_ir.def interfaces/023_wifi.def
interfaces/025_localize.def
+ interfaces/026_mcom.def interfaces/030_position3d.def
+ interfaces/031_simulation.def
interfaces/033_blinkenlight.def
+ interfaces/040_camera.def interfaces/042_map.def
interfaces/044_planner.def
+ interfaces/045_log.def interfaces/049_joystick.def
+ interfaces/050_speech_recognition.def
interfaces/051_opaque.def
+ interfaces/052_position1d.def interfaces/053_actarray.def
+ interfaces/054_limb.def interfaces/055_graphics2d.def
interfaces/056_rfid.def
+ interfaces/057_wsn.def interfaces/058_graphics3d.def
interfaces/059_health.def
+ interfaces/060_imu.def interfaces/061_pointcloud3d.def
interfaces/062_ranger.def
+ interfaces/063_vectormap.def interfaces/064_blackboard.def)
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})
+PROCESS_INTERFACES ("" ${CMAKE_CURRENT_SOURCE_DIR}/interfaces
${player_interfaces_h} ${interfaceDefs})
ADD_CUSTOM_TARGET (player_interfaces ALL
DEPENDS ${player_interfaces_h}
COMMENT "Generating player_interfaces.h")
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://sourceforge.net/services/buy/index.php
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
