Revision: 6931
http://playerstage.svn.sourceforge.net/playerstage/?rev=6931&view=rev
Author: jeremy_asher
Date: 2008-07-28 23:29:25 +0000 (Mon, 28 Jul 2008)
Log Message:
-----------
stage: some CMake script fixes, OpenGL should be located correctly now
Modified Paths:
--------------
code/stage/trunk/CMakeLists.txt
code/stage/trunk/libstage/CMakeLists.txt
code/stage/trunk/libstageplugin/test/CMakeLists.txt
code/stage/trunk/libstageplugin/test/lsp_test_blobfinder.cc
code/stage/trunk/libstageplugin/test/lsp_test_blobfinder.hh
code/stage/trunk/libstageplugin/test/lsp_test_fiducial.cc
code/stage/trunk/libstageplugin/test/lsp_test_fiducial.hh
code/stage/trunk/libstageplugin/test/lsp_test_laser.cc
code/stage/trunk/libstageplugin/test/lsp_test_laser.hh
code/stage/trunk/libstageplugin/test/lsp_test_position2d.cc
code/stage/trunk/libstageplugin/test/lsp_test_position2d.hh
code/stage/trunk/libstageplugin/test/lsp_test_proxy.cc
code/stage/trunk/libstageplugin/test/lsp_test_proxy.hh
code/stage/trunk/libstageplugin/test/lsp_test_simulation.hh
code/stage/trunk/libstageplugin/test/lsp_test_sonar.cc
code/stage/trunk/libstageplugin/test/lsp_test_sonar.hh
code/stage/trunk/libstageplugin/test/lsp_test_speech.hh
Modified: code/stage/trunk/CMakeLists.txt
===================================================================
--- code/stage/trunk/CMakeLists.txt 2008-07-27 02:59:19 UTC (rev 6930)
+++ code/stage/trunk/CMakeLists.txt 2008-07-28 23:29:25 UTC (rev 6931)
@@ -41,6 +41,10 @@
pkg_search_module( LIBPNG REQUIRED libpng )
find_package( OpenGL REQUIRED )
+IF (NOT OPENGL_GLU_FOUND)
+ message(FATAL_ERROR "GLU not found, aborting")
+ENDIF (NOT OPENGL_GLU_FOUND)
+
# Look for player v${MIN_PLAYER} or higher and set flags
# built-ins don't work properly, so use pkg-config directly
FIND_PROGRAM (PKGCONFIG NAMES pkg-config)
@@ -98,8 +102,8 @@
# all targets need these library directories
link_directories(${GLIB_LIBRARY_DIRS}
- ${LIBPNG_LIBRARY_DIRS}
- ${OPENGL_LIBRARY_DIRS}
+ ${GLIB_LIBRARY_DIRS}
+ ${LIBPNG_LIBRARY_DIRS}
)
# work through these subdirs
Modified: code/stage/trunk/libstage/CMakeLists.txt
===================================================================
--- code/stage/trunk/libstage/CMakeLists.txt 2008-07-27 02:59:19 UTC (rev
6930)
+++ code/stage/trunk/libstage/CMakeLists.txt 2008-07-28 23:29:25 UTC (rev
6931)
@@ -1,3 +1,15 @@
+find_path( LTDL_INCLUDE_DIR ltdl.h DOC "Libtool include dir" )
+find_library( LTDL_LIB ltdl DOC "Libtool lib" )
+
+IF (${LTDL_LIB} STREQUAL "LTDL_LIB-NOTFOUND")
+ message( FATAL_ERROR "Libtool library not found, aborting" )
+ENDIF (${LTDL_LIB} STREQUAL "LTDL_LIB-NOTFOUND")
+
+include_directories(
+ ${OPENGL_INCLUDE_DIR}
+ ${LTDL_INCLUDE_DIR}
+)
+
set( stageSrcs ancestor.cc
block.cc
camera.cc
@@ -37,7 +49,7 @@
${GLIB_LIBRARIES}
${OPENGL_LIBRARIES}
${APPLE_LIBRARIES}
- ltdl
+ ${LTDL_LIB}
)
# When linking stage, pass LDFLAGS from fltk-config
Modified: code/stage/trunk/libstageplugin/test/CMakeLists.txt
===================================================================
--- code/stage/trunk/libstageplugin/test/CMakeLists.txt 2008-07-27 02:59:19 UTC
(rev 6930)
+++ code/stage/trunk/libstageplugin/test/CMakeLists.txt 2008-07-28 23:29:25 UTC
(rev 6931)
@@ -1,17 +1,25 @@
-MESSAGE( STATUS "Building Player plugin tests" )
+message( STATUS "Building Player plugin tests" )
-pkg_search_module( PLAYERC REQUIRED playerc )
pkg_search_module( CPPUNIT REQUIRED cppunit )
+find_path( PLAYERC_INCLUDE_DIR libplayerc/playerc.h DOC "libplayerc include
dir" )
+find_library( PLAYERC_LIB playerc DOC "libplayerc lib" )
+
+IF (${PLAYERC_LIB} STREQUAL "PLAYERC_LIB-NOTFOUND")
+ message( FATAL_ERROR "libplayerc library not found, aborting" )
+ENDIF (${PLAYERC_LIB} STREQUAL "PLAYERC_LIB-NOTFOUND")
+
include_directories(
- ${CPPUNIT_INCLUDE_PATH}
+ ${CPPUNIT_INCLUDE_DIRS}
+ ${PLAYERC_INCLUDE_DIR}
)
-link_directories(
+link_directories(
${CPPUNIT_LIBRARY_DIRS}
)
-SET( lspTestSrcs
+
+set( lspTestSrcs
lsp_test.cc
lsp_test_proxy.cc
lsp_test_proxy.hh
@@ -32,7 +40,9 @@
)
add_executable( lsp_test ${lspTestSrcs} )
+
target_link_libraries( lsp_test
- ${PLAYERC_LIBRARIES}
+ ${PLAYERC_LIB}
${CPPUNIT_LIBRARIES}
+ dl
)
Modified: code/stage/trunk/libstageplugin/test/lsp_test_blobfinder.cc
===================================================================
--- code/stage/trunk/libstageplugin/test/lsp_test_blobfinder.cc 2008-07-27
02:59:19 UTC (rev 6930)
+++ code/stage/trunk/libstageplugin/test/lsp_test_blobfinder.cc 2008-07-28
23:29:25 UTC (rev 6931)
@@ -56,4 +56,4 @@
// CPPUNIT_ASSERT_EQUAL_MESSAGE( "id", (unsigned int)2,
blobProxy->blobs[0].id );
-}
\ No newline at end of file
+}
Modified: code/stage/trunk/libstageplugin/test/lsp_test_blobfinder.hh
===================================================================
--- code/stage/trunk/libstageplugin/test/lsp_test_blobfinder.hh 2008-07-27
02:59:19 UTC (rev 6930)
+++ code/stage/trunk/libstageplugin/test/lsp_test_blobfinder.hh 2008-07-28
23:29:25 UTC (rev 6931)
@@ -28,4 +28,4 @@
CPPUNIT_TEST_SUITE_REGISTRATION( lspTest::Blobfinder );
-#endif
\ No newline at end of file
+#endif
Modified: code/stage/trunk/libstageplugin/test/lsp_test_fiducial.cc
===================================================================
--- code/stage/trunk/libstageplugin/test/lsp_test_fiducial.cc 2008-07-27
02:59:19 UTC (rev 6930)
+++ code/stage/trunk/libstageplugin/test/lsp_test_fiducial.cc 2008-07-28
23:29:25 UTC (rev 6931)
@@ -51,4 +51,4 @@
// fiducialProxy->fiducials[i].pose.py,
// fiducialProxy->fiducials[i].pose.pyaw );
// }
-}
\ No newline at end of file
+}
Modified: code/stage/trunk/libstageplugin/test/lsp_test_fiducial.hh
===================================================================
--- code/stage/trunk/libstageplugin/test/lsp_test_fiducial.hh 2008-07-27
02:59:19 UTC (rev 6930)
+++ code/stage/trunk/libstageplugin/test/lsp_test_fiducial.hh 2008-07-28
23:29:25 UTC (rev 6931)
@@ -29,4 +29,4 @@
CPPUNIT_TEST_SUITE_REGISTRATION( lspTest::Fiducial );
-#endif
\ No newline at end of file
+#endif
Modified: code/stage/trunk/libstageplugin/test/lsp_test_laser.cc
===================================================================
--- code/stage/trunk/libstageplugin/test/lsp_test_laser.cc 2008-07-27
02:59:19 UTC (rev 6930)
+++ code/stage/trunk/libstageplugin/test/lsp_test_laser.cc 2008-07-28
23:29:25 UTC (rev 6931)
@@ -72,4 +72,4 @@
// printf("[%6.3f, %6.3f ] \n", laserProxy->scan[i][0],
laserProxy->scan[i][1]);
}
-}
\ No newline at end of file
+}
Modified: code/stage/trunk/libstageplugin/test/lsp_test_laser.hh
===================================================================
--- code/stage/trunk/libstageplugin/test/lsp_test_laser.hh 2008-07-27
02:59:19 UTC (rev 6930)
+++ code/stage/trunk/libstageplugin/test/lsp_test_laser.hh 2008-07-28
23:29:25 UTC (rev 6931)
@@ -31,4 +31,4 @@
CPPUNIT_TEST_SUITE_REGISTRATION( lspTest::Laser );
-#endif
\ No newline at end of file
+#endif
Modified: code/stage/trunk/libstageplugin/test/lsp_test_position2d.cc
===================================================================
--- code/stage/trunk/libstageplugin/test/lsp_test_position2d.cc 2008-07-27
02:59:19 UTC (rev 6930)
+++ code/stage/trunk/libstageplugin/test/lsp_test_position2d.cc 2008-07-28
23:29:25 UTC (rev 6931)
@@ -114,4 +114,4 @@
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "pose (x)", 0, posProxy->px,
Delta );
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "pose (y)", 0, posProxy->py,
Delta );
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "pose (angle)", 0, posProxy->pa,
Delta );
-}
\ No newline at end of file
+}
Modified: code/stage/trunk/libstageplugin/test/lsp_test_position2d.hh
===================================================================
--- code/stage/trunk/libstageplugin/test/lsp_test_position2d.hh 2008-07-27
02:59:19 UTC (rev 6930)
+++ code/stage/trunk/libstageplugin/test/lsp_test_position2d.hh 2008-07-28
23:29:25 UTC (rev 6931)
@@ -30,4 +30,4 @@
CPPUNIT_TEST_SUITE_REGISTRATION( lspTest::Position2D );
-#endif
\ No newline at end of file
+#endif
Modified: code/stage/trunk/libstageplugin/test/lsp_test_proxy.cc
===================================================================
--- code/stage/trunk/libstageplugin/test/lsp_test_proxy.cc 2008-07-27
02:59:19 UTC (rev 6930)
+++ code/stage/trunk/libstageplugin/test/lsp_test_proxy.cc 2008-07-28
23:29:25 UTC (rev 6931)
@@ -14,4 +14,4 @@
void Proxy::disconnect() {
CPPUNIT_ASSERT( playerc_client_disconnect( client ) == 0 );
playerc_client_destroy( client );
-}
\ No newline at end of file
+}
Modified: code/stage/trunk/libstageplugin/test/lsp_test_proxy.hh
===================================================================
--- code/stage/trunk/libstageplugin/test/lsp_test_proxy.hh 2008-07-27
02:59:19 UTC (rev 6930)
+++ code/stage/trunk/libstageplugin/test/lsp_test_proxy.hh 2008-07-28
23:29:25 UTC (rev 6931)
@@ -20,4 +20,4 @@
};
};
-#endif
\ No newline at end of file
+#endif
Modified: code/stage/trunk/libstageplugin/test/lsp_test_simulation.hh
===================================================================
--- code/stage/trunk/libstageplugin/test/lsp_test_simulation.hh 2008-07-27
02:59:19 UTC (rev 6930)
+++ code/stage/trunk/libstageplugin/test/lsp_test_simulation.hh 2008-07-28
23:29:25 UTC (rev 6931)
@@ -30,4 +30,4 @@
CPPUNIT_TEST_SUITE_REGISTRATION( lspTest::Simulation );
-#endif
\ No newline at end of file
+#endif
Modified: code/stage/trunk/libstageplugin/test/lsp_test_sonar.cc
===================================================================
--- code/stage/trunk/libstageplugin/test/lsp_test_sonar.cc 2008-07-27
02:59:19 UTC (rev 6930)
+++ code/stage/trunk/libstageplugin/test/lsp_test_sonar.cc 2008-07-28
23:29:25 UTC (rev 6931)
@@ -42,4 +42,4 @@
CPPUNIT_ASSERT( sonarProxy->scan[i] >= 0 );
// printf(" range[%d]: %6.3f ]\n", i, sonarProxy->scan[i]);
}
-}
\ No newline at end of file
+}
Modified: code/stage/trunk/libstageplugin/test/lsp_test_sonar.hh
===================================================================
--- code/stage/trunk/libstageplugin/test/lsp_test_sonar.hh 2008-07-27
02:59:19 UTC (rev 6930)
+++ code/stage/trunk/libstageplugin/test/lsp_test_sonar.hh 2008-07-28
23:29:25 UTC (rev 6931)
@@ -29,4 +29,4 @@
CPPUNIT_TEST_SUITE_REGISTRATION( lspTest::Sonar );
-#endif
\ No newline at end of file
+#endif
Modified: code/stage/trunk/libstageplugin/test/lsp_test_speech.hh
===================================================================
--- code/stage/trunk/libstageplugin/test/lsp_test_speech.hh 2008-07-27
02:59:19 UTC (rev 6930)
+++ code/stage/trunk/libstageplugin/test/lsp_test_speech.hh 2008-07-28
23:29:25 UTC (rev 6931)
@@ -26,4 +26,4 @@
CPPUNIT_TEST_SUITE_REGISTRATION( lspTest::Speech );
-#endif
\ No newline at end of file
+#endif
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
