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

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

Revision: 88
          http://simspark.svn.sourceforge.net/simspark/?rev=88&view=rev
Author:   hedayat
Date:     2009-08-11 16:17:37 +0000 (Tue, 11 Aug 2009)

Log Message:
-----------
Do not check for ode library name (for detecting correct ode compilation flags) in Linux and Mac

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

Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog	2009-08-09 17:02:16 UTC (rev 87)
+++ trunk/spark/ChangeLog	2009-08-11 16:17:37 UTC (rev 88)
@@ -1,3 +1,8 @@
+2009-08-11  Hedayat Vatankhah  <he...@gr...>
+
+	* cmake/FindODE.cmake: 
+	- do not check for ODe library name under Linux
+
 2009-08-09  Hedayat Vatankhah  <he...@gr...>
 
 	* windows/install_extra.nsi: 

Modified: trunk/spark/cmake/FindODE.cmake
===================================================================
--- trunk/spark/cmake/FindODE.cmake	2009-08-09 17:02:16 UTC (rev 87)
+++ trunk/spark/cmake/FindODE.cmake	2009-08-11 16:17:37 UTC (rev 88)
@@ -68,11 +68,13 @@
       ReleaseSingleDLL ReleaseSingleLib
   )
 
-  IF(WIN32 AND "${ODE_LIBRARY}" MATCHES ".*double.*")
-    SET(ODE_EXTRA_CFLAGS "-DdDOUBLE")
-  ELSE(WIN32 AND "${ODE_LIBRARY}" MATCHES ".*double.*")
-    SET(ODE_EXTRA_CFLAGS "-DdSINGLE")
-  ENDIF(WIN32 AND "${ODE_LIBRARY}" MATCHES ".*double.*")
+  IF (WIN32)
+    IF("${ODE_LIBRARY}" MATCHES ".*double.*")
+      SET(ODE_EXTRA_CFLAGS "-DdDOUBLE")
+    ELSE("${ODE_LIBRARY}" MATCHES ".*double.*")
+      SET(ODE_EXTRA_CFLAGS "-DdSINGLE")
+    ENDIF("${ODE_LIBRARY}" MATCHES ".*double.*")
+  ENDIF (WIN32)
 
   IF (ODE_EXTRA_CFLAGS)
     SET(ODE_CFLAGS ${ODE_EXTRA_CFLAGS} CACHE STRING "Additional ODE flags")


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