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

[<he...@us...>]

Revision: 274
          http://simspark.svn.sourceforge.net/simspark/?rev=274&view=rev
Author:   hedayat
Date:     2011-04-27 19:37:07 +0000 (Wed, 27 Apr 2011)

Log Message:
-----------
Try to find ODE library suggested by ode-config script first.

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

Modified: trunk/rcssserver3d/cmake/FindODE.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindODE.cmake	2011-04-27 07:51:06 UTC (rev 273)
+++ trunk/rcssserver3d/cmake/FindODE.cmake	2011-04-27 19:37:07 UTC (rev 274)
@@ -60,7 +60,20 @@
         ENDFOREACH(flag)
         
         SET(ODE_EXTRA_LDFLAGS ${ODE_CONFIG_LIBS})
-      ELSE("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+
+        # Convert the linker flags to a CMake list.
+        STRING(REGEX REPLACE " +" ";"
+          ODE_CONFIG_LIBS "${ODE_CONFIG_LIBS}")
+    
+        # Look for -l options.
+        FOREACH(flag ${ODE_CONFIG_LIBS})
+          IF("${flag}" MATCHES "^-l.*ode.*")
+            STRING(REGEX REPLACE "^-l" ""
+               ODE_LIB_NAME "${flag}")
+           ENDIF("${flag}" MATCHES "^-l.*ode.*")
+        ENDFOREACH(flag)
+
+       ELSE("${ODE_CONFIG_RESULT}" MATCHES "^0$")
         MESSAGE("Error running ${ODE_CONFIG}: [${ODE_CONFIG_RESULT}]")
       ENDIF("${ODE_CONFIG_RESULT}" MATCHES "^0$")
 
@@ -79,7 +92,7 @@
     NO_DEFAULT_PATH
   )
   FIND_LIBRARY(ODE_LIBRARY
-    NAMES ode ode_double ode_single
+    NAMES ${ODE_LIB_NAME} ode ode_double ode_single
     PATHS
     ${ODE_CONFIG_PREFIX}/lib
     /usr/lib

Modified: trunk/spark/cmake/FindODE.cmake
===================================================================
--- trunk/spark/cmake/FindODE.cmake	2011-04-27 07:51:06 UTC (rev 273)
+++ trunk/spark/cmake/FindODE.cmake	2011-04-27 19:37:07 UTC (rev 274)
@@ -60,7 +60,20 @@
         ENDFOREACH(flag)
         
         SET(ODE_EXTRA_LDFLAGS ${ODE_CONFIG_LIBS})
-      ELSE("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+
+        # Convert the linker flags to a CMake list.
+        STRING(REGEX REPLACE " +" ";"
+          ODE_CONFIG_LIBS "${ODE_CONFIG_LIBS}")
+    
+        # Look for -l options.
+        FOREACH(flag ${ODE_CONFIG_LIBS})
+          IF("${flag}" MATCHES "^-l.*ode.*")
+            STRING(REGEX REPLACE "^-l" ""
+               ODE_LIB_NAME "${flag}")
+           ENDIF("${flag}" MATCHES "^-l.*ode.*")
+        ENDFOREACH(flag)
+
+       ELSE("${ODE_CONFIG_RESULT}" MATCHES "^0$")
         MESSAGE("Error running ${ODE_CONFIG}: [${ODE_CONFIG_RESULT}]")
       ENDIF("${ODE_CONFIG_RESULT}" MATCHES "^0$")
 
@@ -79,7 +92,7 @@
     NO_DEFAULT_PATH
   )
   FIND_LIBRARY(ODE_LIBRARY
-    NAMES ode ode_double ode_single
+    NAMES ${ODE_LIB_NAME} ode ode_double ode_single
     PATHS
     ${ODE_CONFIG_PREFIX}/lib
     /usr/lib


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