Changeset 536 for code/branches/FICN/cmake/FindBoost.cmake

Timestamp:

Dec 16, 2007, 12:57:38 AM (16 years ago)

Author:

landauf

Message:

adjustments for windows

File:

• code/branches/FICN/cmake/FindBoost.cmake (modified) (6 diffs)

code/branches/FICN/cmake/FindBoost.cmake

@@ -76 +76 @@
 # a library is selected for linking.
   SET(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
+#  SET(Boost_LIB_PREFIX "lib")
+#  SET(Boost_LIB_SUFFIX "gcc-mt-1_33_1.lib")
 ENDIF(WIN32)
 
@@ -109 +111 @@
 # Look for an installation.
 #
-FIND_PATH(Boost_INCLUDE_DIR NAMES boost/config.hpp PATH_SUFFIXES ${SUFFIX_FOR_PATH} PATHS
+IF(WIN32)
+  SET(Boost_INCLUDE_DIR ../libs/boost_1_33_1)
+ELSE(WIN32)
+  FIND_PATH(Boost_INCLUDE_DIR NAMES boost/config.hpp PATH_SUFFIXES ${SUFFIX_FOR_PATH} PATHS
 
 # Look in other places.
-  ${BOOST_DIR_SEARCH}
+    ${BOOST_DIR_SEARCH}
 
 # Help the user find it if we cannot.
-  DOC "The ${BOOST_INCLUDE_PATH_DESCRIPTION}"
-)
+    DOC "The ${BOOST_INCLUDE_PATH_DESCRIPTION}"
+  )
+ENDIF(WIN32)
 
 # Assume we didn't find it.
@@ -140 +146 @@
   IF(EXISTS "${Boost_LIBRARY_DIR}/lib")
     SET (Boost_LIBRARY_DIR ${Boost_LIBRARY_DIR}/lib)
+  ELSEIF(EXISTS "${Boost_LIBRARY_DIR}/bin/boost/libs/thread/build/boost_thread.dll/gcc/release/threading-multi")
+    SET (Boost_LIBRARY_DIR ${Boost_LIBRARY_DIR}/bin/boost/libs/thread/build/boost_thread.dll/gcc/release/threading-multi)
   ELSE(EXISTS "${Boost_LIBRARY_DIR}/lib")
     IF(EXISTS "${Boost_LIBRARY_DIR}/stage/lib")
@@ -152 +160 @@
   ENDIF(EXISTS "${Boost_LIBRARY_DIR}/lib")
 
+
   IF(EXISTS "${Boost_INCLUDE_DIR}")
     SET(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
@@ -165 +174 @@
 ENDIF(Boost_INCLUDE_DIR)
 
+
 #
 # Find boost libraries
@@ -175 +185 @@
   gcc
   il
+  gcc-1_33_1
+  gcc-mt-1_33_1
 )