Changeset 7224 for code/trunk

Timestamp:

Aug 26, 2010, 3:00:27 PM (14 years ago)

Author:

rgrieder

Message:

Adjusted CMake code to accept the new v5 dependencies that requires the POCO library.

Location:

code/trunk

Files:

• cmake/LibraryConfig.cmake (modified) (1 diff)
• cmake/PackageConfig.cmake (modified) (2 diffs)
• cmake/tools/FindPOCO.cmake (added)
• src/CMakeLists.txt (modified) (1 diff)

code/trunk/cmake/LibraryConfig.cmake

@@ -91 +91 @@
 FIND_PACKAGE(ALUT            REQUIRED)
 FIND_PACKAGE(ZLIB            REQUIRED)
+IF(POCO_REQUIRED)
+  FIND_PACKAGE(POCO          REQUIRED)
+ENDIF()
 IF(WIN32)
   FIND_PACKAGE(DirectX       REQUIRED)
-ENDIF(WIN32)
+ENDIF()
 
 ##### CEGUI #####

code/trunk/cmake/PackageConfig.cmake

@@ -71 +71 @@
 ENDIF()
 
+# Ogre versions >= 1.7 require the POCO library on Windows for threading
+COMPARE_VERSION_STRINGS(${DEPENDENCY_VERSION} 5 _result TRUE)
+IF(NOT _result EQUAL -1)
+    SET(POCO_REQUIRED TRUE)
+ENDIF()
+
 # Include paths and other special treatments
 SET(ENV{ALUTDIR}               ${DEP_INCLUDE_DIR}/freealut)
@@ -83 +89 @@
 SET(ENV{OGRE_PLUGIN_DIR}       ${DEP_BINARY_DIR})
 SET(ENV{OPENALDIR}             ${DEP_INCLUDE_DIR}/openal)
+SET(ENV{POCODIR}               ${DEP_INCLUDE_DIR}/poco)
 LIST(APPEND CMAKE_INCLUDE_PATH ${DEP_INCLUDE_DIR}/tcl/include)
 LIST(APPEND CMAKE_INCLUDE_PATH ${DEP_INCLUDE_DIR}/zlib/include)

code/trunk/src/CMakeLists.txt

@@ -74 +74 @@
   ${ENET_INCLUDE_DIR}
   ${Boost_INCLUDE_DIRS}
+  ${POCO_INCLUDE_DIR}
   ${OPENAL_INCLUDE_DIRS}
   ${ALUT_INCLUDE_DIR}