Text archives Help

---

Author: abe
Date: Fri Jun 29 14:20:01 2007
New Revision: 1440

Modified:
   trunk/CMake/FindFox.cmake
Log:

Update to search path for fox/Boeing demos.

M    FindFox.cmake


Modified: trunk/CMake/FindFox.cmake
==============================================================================
--- trunk/CMake/FindFox.cmake   (original)
+++ trunk/CMake/FindFox.cmake   Fri Jun 29 14:20:01 2007
@@ -17,20 +17,25 @@
 
###############################################################################
 # FOX  FOX  FOX  FOX  FOX  FOX  FOX  FOX  FOX  FOX  FOX  FOX  FOX  FOX  FOX  
FO
 
-# Look for library here before you look in Thirdparty path
-SET(FOX_INSTALL_PATH "" CACHE PATH "Default search path for Fox install")
-
-# Determine the version of fox to use. Case sensitive
-SET(FOX_VERSION  FOX-1.5 CACHE STRING "Fox Library version string")
+# Search for the "adie" demo program to locate fox.
+FIND_PATH(FOX_INSTALL_PATH adie)
+IF (FOX_INSTALL_PATH)
+  STRING(REGEX REPLACE "[/\\]bin$" "" FOX_INSTALL_PATH ${FOX_INSTALL_PATH})
+ELSE (FOX_INSTALL_PATH)
+  SET(FOX_INSTALL_PATH "" CACHE PATH "Default search path for Fox install")
+ENDIF (FOX_INSTALL_PATH)
 
 # Search for the actual fox library.
-FIND_LIBRARY( FOUND_FOX_LIB     NAMES ${FOX_VERSION}
-                                PATHS ${FOX_INSTALL_PATH}/lib 
${THIRD_PARTY_LIBRARY_PATH} /usr/local/lib /usr/lib
+FIND_LIBRARY( FOUND_FOX_LIB     NAMES FOX-1.5 FOX-1.6
+                                PATHS ${FOX_INSTALL_PATH}/lib 
+                                      ${THIRD_PARTY_LIBRARY_PATH} 
                                 DOC "Fox library path" )
 
 # Seach for the fox include directory.
-STRING(TOLOWER ${FOX_VERSION} FOX_VERSION_LOWERCASE)
-FIND_PATH   ( FOUND_FOX_INCLUDE fx.h 
${FOX_INSTALL_PATH}/include/${FOX_VERSION_LOWERCASE} 
${THIRD_PARTY_INCLUDE_PATH}/${FOX_VERSION_LOWERCASE} /usr/local/include 
/usr/include
+FIND_PATH   ( FOUND_FOX_INCLUDE fx.h 
+              PATHS ${FOX_INSTALL_PATH}/include
+                    ${THIRD_PARTY_INCLUDE_PATH}
+              PATH_SUFFIXES fox-1.5 fox-1.6
               DOC "Fox Include path" )   
 
 

---

• [MANTA] r1440 - trunk/CMake, abe, 06/29/2007

---

Archive powered by MHonArc 2.6.16.