[simspark-svn] SF.net SVN: simspark:[247] trunk

[<sgv...@us...>]

Revision: 247
          http://simspark.svn.sourceforge.net/simspark/?rev=247&view=rev
Author:   sgvandijk
Date:     2011-02-26 00:09:51 +0000 (Sat, 26 Feb 2011)

Log Message:
-----------
- Use ode-config --libs flags

Modified Paths:
--------------
    trunk/rcssserver3d/cmake/FindODE.cmake
    trunk/spark/cmake/FindODE.cmake

Modified: trunk/rcssserver3d/cmake/FindODE.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindODE.cmake	2011-02-18 18:44:14 UTC (rev 246)
+++ trunk/rcssserver3d/cmake/FindODE.cmake	2011-02-26 00:09:51 UTC (rev 247)
@@ -24,6 +24,12 @@
           OUTPUT_STRIP_TRAILING_WHITESPACE
           RESULT_VARIABLE ODE_CONFIG_RESULT
           )
+        EXECUTE_PROCESS(
+          COMMAND ${ODE_CONFIG} --libs
+          OUTPUT_VARIABLE ODE_CONFIG_LIBS
+          OUTPUT_STRIP_TRAILING_WHITESPACE
+          RESULT_VARIABLE ODE_CONFIG_RESULT
+          )
       ELSE(COMMAND EXECUTE_PROCESS)
         EXEC_PROGRAM(${ODE_CONFIG} ARGS "--cflags"
           OUTPUT_VARIABLE ODE_CONFIG_CFLAGS
@@ -33,6 +39,10 @@
           OUTPUT_VARIABLE ODE_CONFIG_PREFIX
           RETURN_VALUE ODE_CONFIG_RESULT
           )
+        EXEC_PROGRAM(${ODE_CONFIG} ARGS "--libs"
+          OUTPUT_VARIABLE ODE_CONFIG_LIBS
+          RETURN_VALUE ODE_CONFIG_RESULT
+          )
       ENDIF(COMMAND EXECUTE_PROCESS)
 
       # Parse the include flags.
@@ -48,9 +58,12 @@
             SET(ODE_EXTRA_CFLAGS ${ODE_EXTRA_CFLAGS} "${flag}")
           ENDIF("${flag}" MATCHES "^-D")
         ENDFOREACH(flag)
+        
+        SET(ODE_EXTRA_LDFLAGS ${ODE_CONFIG_LIBS})
       ELSE("${ODE_CONFIG_RESULT}" MATCHES "^0$")
         MESSAGE("Error running ${ODE_CONFIG}: [${ODE_CONFIG_RESULT}]")
       ENDIF("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+
   ENDIF(ODE_CONFIG)
   
   FIND_PATH(ODE_INCLUDE_DIR ode/ode.h
@@ -99,6 +112,13 @@
     SET(ODE_CFLAGS CACHE STRING "Additional ODE flags")
   ENDIF (ODE_EXTRA_CFLAGS)
 
+  IF (ODE_EXTRA_LDFLAGS)
+    SET(ODE_LDFLAGS ${ODE_EXTRA_LDFLAGS} CACHE STRING "Additional ODE linker flags")
+    MESSAGE(STATUS "Found additional linker flags for ODE: ${ODE_LDFLAGS}")
+  ELSE (ODE_EXTRA_LDFLAGS)
+    SET(ODE_CFLAGS CACHE STRING "Additional ODE linker flags")
+  ENDIF (ODE_EXTRA_LDFLAGS)
+
   IF(ODE_INCLUDE_DIR)
     MESSAGE(STATUS "Found ODE include dir: ${ODE_INCLUDE_DIR}")
   ELSE(ODE_INCLUDE_DIR)

Modified: trunk/spark/cmake/FindODE.cmake
===================================================================
--- trunk/spark/cmake/FindODE.cmake	2011-02-18 18:44:14 UTC (rev 246)
+++ trunk/spark/cmake/FindODE.cmake	2011-02-26 00:09:51 UTC (rev 247)
@@ -24,6 +24,12 @@
           OUTPUT_STRIP_TRAILING_WHITESPACE
           RESULT_VARIABLE ODE_CONFIG_RESULT
           )
+        EXECUTE_PROCESS(
+          COMMAND ${ODE_CONFIG} --libs
+          OUTPUT_VARIABLE ODE_CONFIG_LIBS
+          OUTPUT_STRIP_TRAILING_WHITESPACE
+          RESULT_VARIABLE ODE_CONFIG_RESULT
+          )
       ELSE(COMMAND EXECUTE_PROCESS)
         EXEC_PROGRAM(${ODE_CONFIG} ARGS "--cflags"
           OUTPUT_VARIABLE ODE_CONFIG_CFLAGS
@@ -33,6 +39,10 @@
           OUTPUT_VARIABLE ODE_CONFIG_PREFIX
           RETURN_VALUE ODE_CONFIG_RESULT
           )
+        EXEC_PROGRAM(${ODE_CONFIG} ARGS "--libs"
+          OUTPUT_VARIABLE ODE_CONFIG_LIBS
+          RETURN_VALUE ODE_CONFIG_RESULT
+          )
       ENDIF(COMMAND EXECUTE_PROCESS)
 
       # Parse the include flags.
@@ -48,9 +58,12 @@
             SET(ODE_EXTRA_CFLAGS ${ODE_EXTRA_CFLAGS} "${flag}")
           ENDIF("${flag}" MATCHES "^-D")
         ENDFOREACH(flag)
+        
+        SET(ODE_EXTRA_LDFLAGS ${ODE_CONFIG_LIBS})
       ELSE("${ODE_CONFIG_RESULT}" MATCHES "^0$")
         MESSAGE("Error running ${ODE_CONFIG}: [${ODE_CONFIG_RESULT}]")
       ENDIF("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+
   ENDIF(ODE_CONFIG)
   
   FIND_PATH(ODE_INCLUDE_DIR ode/ode.h
@@ -99,6 +112,13 @@
     SET(ODE_CFLAGS CACHE STRING "Additional ODE flags")
   ENDIF (ODE_EXTRA_CFLAGS)
 
+  IF (ODE_EXTRA_LDFLAGS)
+    SET(ODE_LDFLAGS ${ODE_EXTRA_LDFLAGS} CACHE STRING "Additional ODE linker flags")
+    MESSAGE(STATUS "Found additional linker flags for ODE: ${ODE_LDFLAGS}")
+  ELSE (ODE_EXTRA_LDFLAGS)
+    SET(ODE_CFLAGS CACHE STRING "Additional ODE linker flags")
+  ENDIF (ODE_EXTRA_LDFLAGS)
+
   IF(ODE_INCLUDE_DIR)
     MESSAGE(STATUS "Found ODE include dir: ${ODE_INCLUDE_DIR}")
   ELSE(ODE_INCLUDE_DIR)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.