[simspark-svn] SF.net SVN: simspark:[267] trunk/spark

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

Revision: 267
          http://simspark.svn.sourceforge.net/simspark/?rev=267&view=rev
Author:   hedayat
Date:     2011-04-20 23:14:35 +0000 (Wed, 20 Apr 2011)

Log Message:
-----------
Add support for providing alternative ode-config binaries, useful when multiple version of ODE is installed on the system

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

Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog	2011-03-27 22:01:34 UTC (rev 266)
+++ trunk/spark/ChangeLog	2011-04-20 23:14:35 UTC (rev 267)
@@ -1,3 +1,9 @@
+2011-04-20  Hedayat Vatankhah  <hed...@gm...>
+
+	* cmake/FindODE.cmake: 
+	- ODE_CONFIG_EXEC variable can be used to specify alternative ode-config 
+	  executable
+
 2011-03-28  Hedayat Vatankhah  <hed...@gm...>
 
 	* plugin/sparkmonitor/sparkmonitorlogfileserver.cpp

Modified: trunk/spark/cmake/FindODE.cmake
===================================================================
--- trunk/spark/cmake/FindODE.cmake	2011-03-27 22:01:34 UTC (rev 266)
+++ trunk/spark/cmake/FindODE.cmake	2011-04-20 23:14:35 UTC (rev 267)
@@ -8,7 +8,7 @@
 
 IF (NOT ODE_FOUND)
 
-  FIND_PROGRAM(ODE_CONFIG ode-config)
+  FIND_PROGRAM(ODE_CONFIG NAMES ${ODE_CONFIG_EXEC} ode-config)
   IF(ODE_CONFIG)
       # Use the newer EXECUTE_PROCESS command if it is available.
       IF(COMMAND EXECUTE_PROCESS)


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