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

[<mar...@us...>]

Revision: 90
          http://simspark.svn.sourceforge.net/simspark/?rev=90&view=rev
Author:   marianbuchta
Date:     2009-08-21 21:13:24 +0000 (Fri, 21 Aug 2009)

Log Message:
-----------
add search paths when using 32bit libraries in 64bit Windows

Modified Paths:
--------------
    trunk/rcssserver3d/ChangeLog
    trunk/rcssserver3d/cmake/FindBoost.cmake
    trunk/rcssserver3d/cmake/FindDevIL.cmake
    trunk/rcssserver3d/cmake/FindFreetype.cmake
    trunk/rcssserver3d/cmake/FindODE.cmake
    trunk/rcssserver3d/cmake/FindSpark.cmake
    trunk/rsgedit/ChangeLog
    trunk/rsgedit/cmake/FindSpark.cmake
    trunk/simspark-utilities/ChangeLog
    trunk/simspark-utilities/cmake/FindSpark.cmake
    trunk/spark/ChangeLog
    trunk/spark/cmake/FindBoost.cmake
    trunk/spark/cmake/FindDevIL.cmake
    trunk/spark/cmake/FindFreetype.cmake
    trunk/spark/cmake/FindODE.cmake
    trunk/spark/cmake/FindRuby.cmake
    trunk/spark/cmake/FindZLIB.cmake

Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog	2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/rcssserver3d/ChangeLog	2009-08-21 21:13:24 UTC (rev 90)
@@ -1,3 +1,12 @@
+2009-08-21  Marian Buchta  <mar...@gm...>
+
+	* cmake/FindBoost.cmake:
+	* cmake/FindDevIL.cmake:
+	* cmake/FindFreetype.cmake:
+	* cmake/FindODE.cmake:
+	* cmake/FindSpark.cmake:
+	- add search paths when using 32bit libraries in 64bit Windows
+
 2009-08-13  Hedayat Vatankhah  <he...@gr...>
 
 	* simspark/CMakeLists.txt: 

Modified: trunk/rcssserver3d/cmake/FindBoost.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindBoost.cmake	2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/rcssserver3d/cmake/FindBoost.cmake	2009-08-21 21:13:24 UTC (rev 90)
@@ -358,6 +358,7 @@
     "$ENV{ProgramFiles}/boost"
     C:/library/boost
     "C:/Program Files/boost"
+    "C:/Program Files (x86)/boost"
     /sw/local/include
   )
 
@@ -619,6 +620,7 @@
     "$ENV{ProgramFiles}/boost"
     C:/library/boost/stage/lib
     "C:/Program Files/boost/stage/lib"
+    "C:/Program Files (x86)/boost/stage/lib"
     C:/boost/lib
     /sw/local/lib
   )

Modified: trunk/rcssserver3d/cmake/FindDevIL.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindDevIL.cmake	2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/rcssserver3d/cmake/FindDevIL.cmake	2009-08-21 21:13:24 UTC (rev 90)
@@ -33,6 +33,7 @@
   /opt/net/gcc33/DevIL
   C:/library/DevIL
   "C:/Program Files/DevIL"
+  "C:/Program Files (x86)/DevIL"
   C:/DevIL
   )
 

Modified: trunk/rcssserver3d/cmake/FindFreetype.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindFreetype.cmake	2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/rcssserver3d/cmake/FindFreetype.cmake	2009-08-21 21:13:24 UTC (rev 90)
@@ -41,6 +41,7 @@
   /usr/freeware/include
   C:/library/GnuWin32/include
   "C:/Program Files/GnuWin32/include"
+  "C:/Program Files (x86)/GnuWin32/include"
   C:/GnuWin32/include
 )
 
@@ -56,6 +57,7 @@
   /usr/freeware/include
   C:/library/GnuWin32/include/freetype2
   "C:/Program Files/GnuWin32/include/freetype2"
+  "C:/Program Files (x86)/GnuWin32/include/freetype2"
   C:/GnuWin32/include/freetype2
   PATH_SUFFIXES freetype2
 )
@@ -73,6 +75,7 @@
   /usr/freeware
   C:/library/GnuWin32/lib
   "C:/Program Files/GnuWin32/lib"
+  "C:/Program Files (x86)/GnuWin32/lib"
   C:/GnuWin32/lib
 )
 

Modified: trunk/rcssserver3d/cmake/FindODE.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindODE.cmake	2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/rcssserver3d/cmake/FindODE.cmake	2009-08-21 21:13:24 UTC (rev 90)
@@ -50,6 +50,7 @@
     $ENV{INCLUDE}
     C:/library/ode/include
     "C:/Program Files/ode/include"
+    "C:/Program Files (x86)/ode/include"
     C:/ode/include
   )
   FIND_LIBRARY(ODE_LIBRARY
@@ -61,6 +62,7 @@
     $ENV{OGRE_HOME}/lib # OGRE SDK on WIN32
     C:/library/ode/lib/
     "C:/Program Files/ode/lib/"
+    "C:/Program Files (x86)/ode/lib/"
     C:/ode/lib/
     PATH_SUFFIXES
       releaselib

Modified: trunk/rcssserver3d/cmake/FindSpark.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindSpark.cmake	2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/rcssserver3d/cmake/FindSpark.cmake	2009-08-21 21:13:24 UTC (rev 90)
@@ -27,7 +27,7 @@
   SET(SPARK_FIND_QUIETLY TRUE)
 ENDIF (SPARK_INCLUDE_DIR)
 
-SET(SPARK_DIR $ENV{SPARK_DIR} "C:/Program Files/simspark" "C:/Library/simspark")
+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}

Modified: trunk/rsgedit/ChangeLog
===================================================================
--- trunk/rsgedit/ChangeLog	2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/rsgedit/ChangeLog	2009-08-21 21:13:24 UTC (rev 90)
@@ -1,3 +1,9 @@
+2009-08-21  Marian Buchta  <mar...@gm...>
+
+	* cmake/FindSpark.cmake:
+	- update file from rcssserver3d
+	- add search paths when using 32bit libraries in 64bit Windows
+	
 2009-08-13  Hedayat Vatankhah  <he...@gr...>
 
 	* src/CMakeLists.txt: 

Modified: trunk/rsgedit/cmake/FindSpark.cmake
===================================================================
--- trunk/rsgedit/cmake/FindSpark.cmake	2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/rsgedit/cmake/FindSpark.cmake	2009-08-21 21:13:24 UTC (rev 90)
@@ -24,10 +24,16 @@
   SET(SPARK_FIND_QUIETLY TRUE)
 ENDIF (SPARK_INCLUDE_DIR)
 
-FIND_PATH(SPARK_INCLUDE_DIR spark/spark.h PATH_SUFFIXES simspark)
+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}
+  PATH_SUFFIXES simspark include/simspark)
+
 SET(SPARK_NAMES spark spark_debug)
-FIND_LIBRARY(SPARK_LIBRARY NAMES ${SPARK_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(SPARK_LIBRARY NAMES ${SPARK_NAMES}
+  PATHS ${SPARK_DIR}
+  PATH_SUFFIXES simspark lib/simspark)
 GET_FILENAME_COMPONENT(SPARK_LIB_DIR ${SPARK_LIBRARY} PATH)
 
 # handle the QUIETLY and REQUIRED arguments and set SPARK_FOUND to TRUE if 
@@ -50,10 +56,14 @@
   SET(SALT_FIND_QUIETLY TRUE)
 ENDIF (SALT_INCLUDE_DIR)
 
-FIND_PATH(SALT_INCLUDE_DIR salt/salt.h PATH_SUFFIXES simspark)
+FIND_PATH(SALT_INCLUDE_DIR salt/salt.h
+  PATHS ${SPARK_DIR}
+  PATH_SUFFIXES simspark include/simspark)
 
 SET(SALT_NAMES salt salt_debug)
-FIND_LIBRARY(SALT_LIBRARY NAMES ${SALT_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(SALT_LIBRARY NAMES ${SALT_NAMES}
+  PATHS ${SPARK_DIR}
+  PATH_SUFFIXES simspark lib/simspark)
 
 # handle the QUIETLY and REQUIRED arguments and set SALT_FOUND to TRUE if 
 # all listed variables are TRUE
@@ -75,10 +85,14 @@
   SET(ZEITGEIST_FIND_QUIETLY TRUE)
 ENDIF (ZEITGEIST_INCLUDE_DIR)
 
-FIND_PATH(ZEITGEIST_INCLUDE_DIR zeitgeist/zeitgeist.h PATH_SUFFIXES simspark)
+FIND_PATH(ZEITGEIST_INCLUDE_DIR zeitgeist/zeitgeist.h
+  PATHS ${SPARK_DIR}
+  PATH_SUFFIXES simspark include/simspark)
 
 SET(ZEITGEIST_NAMES zeitgeist zeitgeist_debug)
-FIND_LIBRARY(ZEITGEIST_LIBRARY NAMES ${ZEITGEIST_NAMES} PATH_SUFFIXES simspark)
+FIND_LIBRARY(ZEITGEIST_LIBRARY NAMES ${ZEITGEIST_NAMES}
+  PATHS ${SPARK_DIR}
+  PATH_SUFFIXES simspark lib/simspark)
 
 # handle the QUIETLY and REQUIRED arguments and set ZEITGEIST_FOUND to TRUE if 
 # all listed variables are TRUE
@@ -100,10 +114,14 @@
   SET(OXYGEN_FIND_QUIETLY TRUE)
 ENDIF (OXYGEN_INCLUDE_DIR)
 
-FIND_PATH(OXYGEN_INCLUDE_DIR oxygen/oxygen.h PATH_SUFFIXES simspark)
+FIND_PATH(OXYGEN_INCLUDE_DIR oxygen/oxygen.h
+  PATHS ${SPARK_DIR}
+  PATH_SUFFIXES simspark include/simspark)
 
 SET(OXYGEN_NAMES oxygen oxygen_debug)
-FIND_LIBRARY(OXYGEN_LIBRARY NAMES ${OXYGEN_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(OXYGEN_LIBRARY NAMES ${OXYGEN_NAMES}
+  PATHS ${SPARK_DIR}
+  PATH_SUFFIXES simspark lib/simspark)
 
 # handle the QUIETLY and REQUIRED arguments and set OXYGEN_FOUND to TRUE if 
 # all listed variables are TRUE
@@ -125,10 +143,14 @@
   SET(KEROSIN_FIND_QUIETLY TRUE)
 ENDIF (KEROSIN_INCLUDE_DIR)
 
-FIND_PATH(KEROSIN_INCLUDE_DIR kerosin/kerosin.h PATH_SUFFIXES simspark)
+FIND_PATH(KEROSIN_INCLUDE_DIR kerosin/kerosin.h
+  PATHS ${SPARK_DIR}
+  PATH_SUFFIXES simspark include/simspark)
 
 SET(KEROSIN_NAMES kerosin kerosin_debug)
-FIND_LIBRARY(KEROSIN_LIBRARY NAMES ${KEROSIN_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(KEROSIN_LIBRARY NAMES ${KEROSIN_NAMES}
+  PATHS ${SPARK_DIR}
+  PATH_SUFFIXES simspark lib/simspark)
 
 # handle the QUIETLY and REQUIRED arguments and set KEROSIN_FOUND to TRUE if 
 # all listed variables are TRUE

Modified: trunk/simspark-utilities/ChangeLog
===================================================================
--- trunk/simspark-utilities/ChangeLog	2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/simspark-utilities/ChangeLog	2009-08-21 21:13:24 UTC (rev 90)
@@ -1,3 +1,8 @@
+2009-08-21  Marian Buchta  <mar...@gm...>
+
+	* cmake/FindSpark.cmake:
+	- add search path when using 32bit library in 64bit Windows
+
 2009-08-13  Hedayat Vatankhah  <he...@gr...>
 
 	* CMakeLists.txt: 
@@ -9,13 +14,13 @@
 	* samplesim/CMakeLists.txt: 
 	- remove duplicate include directories 
 
-2009-08-07  Marian Buchta  <mar...@gm...>
-
-	* CMakeLists.txt
-	- try to find and copy all thirdparty dlls in the binary package's bin/ directory. 
-
-	* cmake/FindSpark.cmake
-	- Update script from rcssserver3d\cmake\FindSpark.cmake
-	
-	* sampleagent/CMakeLists.txt
+2009-08-07  Marian Buchta  <mar...@gm...>
+
+	* CMakeLists.txt
+	- try to find and copy all thirdparty dlls in the binary package's bin/ directory. 
+
+	* cmake/FindSpark.cmake
+	- Update script from rcssserver3d\cmake\FindSpark.cmake
+	
+	* sampleagent/CMakeLists.txt
 	- add RCSSNET3D_LIBRARIES and NET_LIBS - fixed linking error in VS2008
\ No newline at end of file

Modified: trunk/simspark-utilities/cmake/FindSpark.cmake
===================================================================
--- trunk/simspark-utilities/cmake/FindSpark.cmake	2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/simspark-utilities/cmake/FindSpark.cmake	2009-08-21 21:13:24 UTC (rev 90)
@@ -27,7 +27,7 @@
   SET(SPARK_FIND_QUIETLY TRUE)
 ENDIF (SPARK_INCLUDE_DIR)
 
-SET(SPARK_DIR $ENV{SPARK_DIR} "C:/Program Files/simspark" "C:/Library/simspark")
+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}

Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog	2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/spark/ChangeLog	2009-08-21 21:13:24 UTC (rev 90)
@@ -1,3 +1,13 @@
+2009-08-21  Marian Buchta  <mar...@gm...>
+
+	* cmake/FindBoost.cmake:
+	* cmake/FindDevIL.cmake:
+	* cmake/FindFreetype.cmake:
+	* cmake/FindODE.cmake:
+	* cmake/FindRuby.cmake:
+	* cmake/FindZLIB.cmake:
+	- add search paths when using 32bit libraries in 64bit Windows
+
 2009-08-13  Hedayat Vatankhah  <he...@gr...>
 
 	* spark/CMakeLists.txt: 

Modified: trunk/spark/cmake/FindBoost.cmake
===================================================================
--- trunk/spark/cmake/FindBoost.cmake	2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/spark/cmake/FindBoost.cmake	2009-08-21 21:13:24 UTC (rev 90)
@@ -358,6 +358,7 @@
     "$ENV{ProgramFiles}/boost"
     C:/library/boost
     "C:/Program Files/boost"
+    "C:/Program Files (x86)/boost"
     /sw/local/include
   )
 
@@ -619,6 +620,7 @@
     "$ENV{ProgramFiles}/boost"
     C:/library/boost/stage/lib
     "C:/Program Files/boost/stage/lib"
+    "C:/Program Files (x86)/boost/stage/lib"
     C:/boost/lib
     /sw/local/lib
   )

Modified: trunk/spark/cmake/FindDevIL.cmake
===================================================================
--- trunk/spark/cmake/FindDevIL.cmake	2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/spark/cmake/FindDevIL.cmake	2009-08-21 21:13:24 UTC (rev 90)
@@ -33,6 +33,7 @@
   /opt/net/gcc33/DevIL
   C:/library/DevIL
   "C:/Program Files/DevIL"
+  "C:/Program Files (x86)/DevIL"
   C:/DevIL
   )
 

Modified: trunk/spark/cmake/FindFreetype.cmake
===================================================================
--- trunk/spark/cmake/FindFreetype.cmake	2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/spark/cmake/FindFreetype.cmake	2009-08-21 21:13:24 UTC (rev 90)
@@ -41,6 +41,7 @@
   /usr/freeware/include
   C:/library/GnuWin32/include
   "C:/Program Files/GnuWin32/include"
+  "C:/Program Files (x86)/GnuWin32/include"
   C:/GnuWin32/include
 )
 
@@ -56,6 +57,7 @@
   /usr/freeware/include
   C:/library/GnuWin32/include/freetype2
   "C:/Program Files/GnuWin32/include/freetype2"
+  "C:/Program Files (x86)/GnuWin32/include/freetype2"
   C:/GnuWin32/include/freetype2
   PATH_SUFFIXES freetype2
 )
@@ -73,6 +75,7 @@
   /usr/freeware
   C:/library/GnuWin32/lib
   "C:/Program Files/GnuWin32/lib"
+  "C:/Program Files (x86)/GnuWin32/lib"
   C:/GnuWin32/lib
 )
 

Modified: trunk/spark/cmake/FindODE.cmake
===================================================================
--- trunk/spark/cmake/FindODE.cmake	2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/spark/cmake/FindODE.cmake	2009-08-21 21:13:24 UTC (rev 90)
@@ -50,6 +50,7 @@
     $ENV{INCLUDE}
     C:/library/ode/include
     "C:/Program Files/ode/include"
+    "C:/Program Files (x86)/ode/include"
     C:/ode/include
   )
   FIND_LIBRARY(ODE_LIBRARY
@@ -61,6 +62,7 @@
     $ENV{OGRE_HOME}/lib # OGRE SDK on WIN32
     C:/library/ode/lib/
     "C:/Program Files/ode/lib/"
+    "C:/Program Files (x86)/ode/lib/"
     C:/ode/lib/
     PATH_SUFFIXES
       releaselib

Modified: trunk/spark/cmake/FindRuby.cmake
===================================================================
--- trunk/spark/cmake/FindRuby.cmake	2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/spark/cmake/FindRuby.cmake	2009-08-21 21:13:24 UTC (rev 90)
@@ -77,7 +77,11 @@
    ${RUBY_HDR_DIR}
   /usr/lib/ruby/1.8/i586-linux-gnu/
   C:/library/ruby/lib/ruby/1.8/i386-mswin32/
+  C:/Program Files/ruby/lib/ruby/1.8/i386-mswin32/
+  C:/Program Files (x86)/ruby/lib/ruby/1.8/i386-mswin32/
   C:/library/ruby/include/ruby-1.9.1/
+  C:/Program Files/ruby/include/ruby-1.9.1/
+  C:/Program Files (x86)/ruby/include/ruby-1.9.1/
   )
 
 # search the ruby library, the version for MSVC can have the "msvc" prefix and the "static" suffix
@@ -86,6 +90,8 @@
         msvcrt-ruby18 msvcrt-ruby19 msvcrt-ruby191 msvcrt-ruby18-static msvcrt-ruby19-static msvcrt-ruby191-static
   PATHS ${RUBY_POSSIBLE_LIB_DIR}
   C:/library/ruby/lib/
+  C:/Program Files/ruby/lib/
+  C:/Program Files (x86)/ruby/lib/
   )
   
 set(RUBY_INCLUDE_PATH ${RUBY_INCLUDE_PATH} ${RUBY_ARCH_DIR} "${RUBY_INCLUDE_PATH}/i386-mswin32")

Modified: trunk/spark/cmake/FindZLIB.cmake
===================================================================
--- trunk/spark/cmake/FindZLIB.cmake	2009-08-13 14:54:41 UTC (rev 89)
+++ trunk/spark/cmake/FindZLIB.cmake	2009-08-21 21:13:24 UTC (rev 90)
@@ -16,6 +16,7 @@
 	C:/library/
 	C:/
 	"C:/Program Files/"
+	"C:/Program Files (x86)/"
 	PATH_SUFFIXES zlib123
 )
 
@@ -25,6 +26,7 @@
 	C:/library/zlib123/
 	C:/zlib123/
 	"C:/Program Files/zlib123/"
+	"C:/Program Files (x86)/zlib123/"
 	PATH_SUFFIXES projects/visualc6/Win32_DLL_Release
 )
 


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