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

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

Revision: 245
          http://simspark.svn.sourceforge.net/simspark/?rev=245&view=rev
Author:   sgvandijk
Date:     2011-02-11 22:53:50 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
- Use ode-config to find ODE. Helps find locally installed ODE
- Use HINTS instead of PATHS for finding simspark, so SPARK_DIR has preference over default paths

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

Modified: trunk/rcssserver3d/cmake/FindODE.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindODE.cmake	2011-02-10 18:40:37 UTC (rev 244)
+++ trunk/rcssserver3d/cmake/FindODE.cmake	2011-02-11 22:53:50 UTC (rev 245)
@@ -18,11 +18,21 @@
           OUTPUT_STRIP_TRAILING_WHITESPACE
           RESULT_VARIABLE ODE_CONFIG_RESULT
           )
+        EXECUTE_PROCESS(
+          COMMAND ${ODE_CONFIG} --prefix
+          OUTPUT_VARIABLE ODE_CONFIG_PREFIX
+          OUTPUT_STRIP_TRAILING_WHITESPACE
+          RESULT_VARIABLE ODE_CONFIG_RESULT
+          )
       ELSE(COMMAND EXECUTE_PROCESS)
         EXEC_PROGRAM(${ODE_CONFIG} ARGS "--cflags"
           OUTPUT_VARIABLE ODE_CONFIG_CFLAGS
           RETURN_VALUE ODE_CONFIG_RESULT
           )
+        EXEC_PROGRAM(${ODE_CONFIG} ARGS "--prefix"
+          OUTPUT_VARIABLE ODE_CONFIG_PREFIX
+          RETURN_VALUE ODE_CONFIG_RESULT
+          )
       ENDIF(COMMAND EXECUTE_PROCESS)
 
       # Parse the include flags.
@@ -44,22 +54,25 @@
   ENDIF(ODE_CONFIG)
   
   FIND_PATH(ODE_INCLUDE_DIR ode/ode.h
+    ${ODE_CONFIG_PREFIX}/include
     /usr/include
     /usr/local/include
-    $ENV{OGRE_HOME}/include # OGRE SDK on WIN32
+    $ENV{ODE_HOME}/include
     $ENV{INCLUDE}
     C:/library/ode/include
     "C:/Program Files/ode/include"
     "C:/Program Files (x86)/ode/include"
     C:/ode/include
+    NO_DEFAULT_PATH
   )
   FIND_LIBRARY(ODE_LIBRARY
     NAMES ode ode_double ode_single
     PATHS
+    ${ODE_CONFIG_PREFIX}/lib
     /usr/lib
     /usr/lib64
     /usr/local/lib
-    $ENV{OGRE_HOME}/lib # OGRE SDK on WIN32
+    $ENV{ODE_HOME}/lib
     C:/library/ode/lib/
     "C:/Program Files/ode/lib/"
     "C:/Program Files (x86)/ode/lib/"
@@ -68,6 +81,7 @@
       releaselib
       ReleaseDoubleDLL ReleaseDoubleLib 
       ReleaseSingleDLL ReleaseSingleLib
+    NO_DEFAULT_PATH
   )
 
   IF (WIN32)

Modified: trunk/rcssserver3d/cmake/FindSpark.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindSpark.cmake	2011-02-10 18:40:37 UTC (rev 244)
+++ trunk/rcssserver3d/cmake/FindSpark.cmake	2011-02-11 22:53:50 UTC (rev 245)
@@ -30,12 +30,12 @@
 SET(SPARK_DIR $ENV{SPARK_DIR} "C:/Program Files/simspark" "C:/Program Files (x86)/simspark" "C:/library/simspark")
 
 FIND_PATH(SPARK_INCLUDE_DIR spark/spark.h
-  PATHS ${SPARK_DIR}
+  HINTS ${SPARK_DIR}
   PATH_SUFFIXES simspark include/simspark)
 
 SET(SPARK_NAMES spark spark_debug)
 FIND_LIBRARY(SPARK_LIBRARY NAMES ${SPARK_NAMES}
-  PATHS ${SPARK_DIR}
+  HINTS ${SPARK_DIR}
   PATH_SUFFIXES simspark lib/simspark)
 GET_FILENAME_COMPONENT(SPARK_LIB_DIR ${SPARK_LIBRARY} PATH)
 
@@ -60,12 +60,12 @@
 ENDIF (SALT_INCLUDE_DIR)
 
 FIND_PATH(SALT_INCLUDE_DIR salt/salt.h
-  PATHS ${SPARK_DIR}
+  HINTS ${SPARK_DIR}
   PATH_SUFFIXES simspark include/simspark)
 
 SET(SALT_NAMES salt salt_debug)
 FIND_LIBRARY(SALT_LIBRARY NAMES ${SALT_NAMES}
-  PATHS ${SPARK_DIR}
+  HINTS ${SPARK_DIR}
   PATH_SUFFIXES simspark lib/simspark)
 
 # handle the QUIETLY and REQUIRED arguments and set SALT_FOUND to TRUE if 
@@ -89,12 +89,12 @@
 ENDIF (ZEITGEIST_INCLUDE_DIR)
 
 FIND_PATH(ZEITGEIST_INCLUDE_DIR zeitgeist/zeitgeist.h
-  PATHS ${SPARK_DIR}
+  HINTS ${SPARK_DIR}
   PATH_SUFFIXES simspark include/simspark)
 
 SET(ZEITGEIST_NAMES zeitgeist zeitgeist_debug)
 FIND_LIBRARY(ZEITGEIST_LIBRARY NAMES ${ZEITGEIST_NAMES}
-  PATHS ${SPARK_DIR}
+  HINTS ${SPARK_DIR}
   PATH_SUFFIXES simspark lib/simspark)
 
 # handle the QUIETLY and REQUIRED arguments and set ZEITGEIST_FOUND to TRUE if 
@@ -118,12 +118,12 @@
 ENDIF (OXYGEN_INCLUDE_DIR)
 
 FIND_PATH(OXYGEN_INCLUDE_DIR oxygen/oxygen.h
-  PATHS ${SPARK_DIR}
+  HINTS ${SPARK_DIR}
   PATH_SUFFIXES simspark include/simspark)
 
 SET(OXYGEN_NAMES oxygen oxygen_debug)
 FIND_LIBRARY(OXYGEN_LIBRARY NAMES ${OXYGEN_NAMES}
-  PATHS ${SPARK_DIR}
+  HINTS ${SPARK_DIR}
   PATH_SUFFIXES simspark lib/simspark)
 
 # handle the QUIETLY and REQUIRED arguments and set OXYGEN_FOUND to TRUE if 
@@ -147,12 +147,12 @@
 ENDIF (KEROSIN_INCLUDE_DIR)
 
 FIND_PATH(KEROSIN_INCLUDE_DIR kerosin/kerosin.h
-  PATHS ${SPARK_DIR}
+  HINTS ${SPARK_DIR}
   PATH_SUFFIXES simspark include/simspark)
 
 SET(KEROSIN_NAMES kerosin kerosin_debug)
 FIND_LIBRARY(KEROSIN_LIBRARY NAMES ${KEROSIN_NAMES}
-  PATHS ${SPARK_DIR}
+  HINTS ${SPARK_DIR}
   PATH_SUFFIXES simspark lib/simspark)
 
 # handle the QUIETLY and REQUIRED arguments and set KEROSIN_FOUND to TRUE if 
@@ -176,12 +176,12 @@
 ENDIF (RCSSNET3D_INCLUDE_DIR)
 
 FIND_PATH(RCSSNET3D_INCLUDE_DIR rcssnet/addr.hpp
-  PATHS ${SPARK_DIR}
+  HINTS ${SPARK_DIR}
   PATH_SUFFIXES simspark include/simspark)
 
 SET(RCSSNET3D_NAMES rcssnet3D rcssnet3D_debug)
 FIND_LIBRARY(RCSSNET3D_LIBRARY NAMES ${RCSSNET3D_NAMES}
-  PATHS ${SPARK_DIR}
+  HINTS ${SPARK_DIR}
   PATH_SUFFIXES simspark lib/simspark)
 
 # handle the QUIETLY and REQUIRED arguments and set RCSSNET3D_FOUND to TRUE if 

Modified: trunk/spark/cmake/FindODE.cmake
===================================================================
--- trunk/spark/cmake/FindODE.cmake	2011-02-10 18:40:37 UTC (rev 244)
+++ trunk/spark/cmake/FindODE.cmake	2011-02-11 22:53:50 UTC (rev 245)
@@ -18,11 +18,21 @@
           OUTPUT_STRIP_TRAILING_WHITESPACE
           RESULT_VARIABLE ODE_CONFIG_RESULT
           )
+        EXECUTE_PROCESS(
+          COMMAND ${ODE_CONFIG} --prefix
+          OUTPUT_VARIABLE ODE_CONFIG_PREFIX
+          OUTPUT_STRIP_TRAILING_WHITESPACE
+          RESULT_VARIABLE ODE_CONFIG_RESULT
+          )
       ELSE(COMMAND EXECUTE_PROCESS)
         EXEC_PROGRAM(${ODE_CONFIG} ARGS "--cflags"
           OUTPUT_VARIABLE ODE_CONFIG_CFLAGS
           RETURN_VALUE ODE_CONFIG_RESULT
           )
+        EXEC_PROGRAM(${ODE_CONFIG} ARGS "--prefix"
+          OUTPUT_VARIABLE ODE_CONFIG_PREFIX
+          RETURN_VALUE ODE_CONFIG_RESULT
+          )
       ENDIF(COMMAND EXECUTE_PROCESS)
 
       # Parse the include flags.
@@ -44,6 +54,7 @@
   ENDIF(ODE_CONFIG)
   
   FIND_PATH(ODE_INCLUDE_DIR ode/ode.h
+    ${ODE_CONFIG_PREFIX}/include
     /usr/include
     /usr/local/include
     $ENV{ODE_HOME}/include
@@ -52,10 +63,12 @@
     "C:/Program Files/ode/include"
     "C:/Program Files (x86)/ode/include"
     C:/ode/include
+    NO_DEFAULT_PATH
   )
   FIND_LIBRARY(ODE_LIBRARY
     NAMES ode ode_double ode_single
     PATHS
+    ${ODE_CONFIG_PREFIX}/lib
     /usr/lib
     /usr/lib64
     /usr/local/lib
@@ -68,6 +81,7 @@
       releaselib
       ReleaseDoubleDLL ReleaseDoubleLib 
       ReleaseSingleDLL ReleaseSingleLib
+    NO_DEFAULT_PATH
   )
 
   IF (WIN32)


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