Changeset 1502 for code/trunk/cmake

Timestamp:

Jun 1, 2008, 3:54:20 PM (16 years ago)

Author:

rgrieder

Message:

• @everyone: Do not create a branch until I've added the svn:eol-style property correctly. Otherwise this would cost me another 4 hours or so when we want to merge back.
• merged network branch back to trunk
• I had to omit the changes from last evening concerning the line endings
• might not work yet because of the line endings
• @beni: script branch is the only branch still open. you probably will have to apply a patch because of inconsistent new lines

Location:

code/trunk/cmake

Files:

• FindBoost.cmake (modified) (3 diffs)
• FindZLIB.cmake (modified) (2 diffs)

code/trunk/cmake/FindBoost.cmake

@@ -102 +102 @@
 SET(SUFFIX_FOR_PATH
  boost
+ boost-1_35_0
+ boost-1_35
  boost-1_34_1
  boost-1_34_0
@@ -113 +115 @@
 #
 IF(WIN32)
-  SET(Boost_INCLUDE_DIR ../libs/boost_1_33_1)
+  SET(Boost_INCLUDE_DIR
+#    ../libs/boost_1_33_1
+    ../libs/boost_1_34_1
+#    ../libs/boost_1_35_0
+  )
 ELSE(WIN32)
   FIND_PATH(Boost_INCLUDE_DIR NAMES boost/config.hpp PATH_SUFFIXES ${SUFFIX_FOR_PATH} PATHS
@@ -188 +194 @@
   gcc-1_33_1
   gcc-mt-1_33_1
+  mgw34-mt-1_34_1
+  mgw34-mt-1_35
 )
 

code/trunk/cmake/FindZLIB.cmake

@@ -58 +58 @@
   ENDIF(EXISTS "../libs/ogre/Dependencies/lib/Release")
 
+  FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
+    ../libs/ogre/Dependencies/include
+  )
+
   FIND_LIBRARY(ZLIB_LIBRARY
     NAMES zlib
@@ -63 +67 @@
   )
 
-  IF(ZLIB_LIBRARY)
+  IF(ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
     MESSAGE(STATUS "Zlib was found.")
-  ELSE(ZLIB_LIBRARY)
+  ELSE(ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
     MESSAGE(FATAL_ERROR "Zlib was NOT found.")
-  ENDIF(ZLIB_LIBRARY)
+  ENDIF(ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
 ENDIF(WIN32)