Changeset 9687

Timestamp:

Oct 3, 2013, 11:34:34 PM (11 years ago)

Author:

landauf

Message:

support precompiled dependencies v7.0 for mingw (which use boost for threading in ogre)

Location:

code/trunk/cmake

Files:

• LibraryConfig.cmake (modified) (1 diff)
• PackageConfig.cmake (modified) (1 diff)
• PackageConfigMinGW.cmake (modified) (1 diff)

code/trunk/cmake/LibraryConfig.cmake

@@ -177 +177 @@
 ELSEIF(OGRE_NEEDS_BOOST)
   # Always link against boost too because of threading
-  SET(OGRE_LIBRARY ${OGRE_LIBRARY} ${Boost_THREAD_LIBRARY})
+  SET(OGRE_LIBRARY ${OGRE_LIBRARY} ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY})
 ENDIF()
 

code/trunk/cmake/PackageConfig.cmake

@@ -33 +33 @@
 COMPARE_VERSION_STRINGS(${DEPENDENCY_VERSION} 5 _result TRUE)
 IF(NOT _result EQUAL -1 AND NOT APPLE)
-  SET(OGRE_NEEDS_POCO TRUE)
+  # In dependency package 7 poco is not used anymore - instead we use boost
+  COMPARE_VERSION_STRINGS(${DEPENDENCY_VERSION} 7 _result TRUE)
+  IF(NOT _result EQUAL -1)
+    SET(OGRE_NEEDS_BOOST TRUE)
+  ELSE()
+    SET(OGRE_NEEDS_POCO TRUE)
+  ENDIF()
 ENDIF()
 

code/trunk/cmake/PackageConfigMinGW.cmake

@@ -29 +29 @@
 
   INCLUDE(CheckPackageVersion)
-  CHECK_PACKAGE_VERSION(6.0)
+  CHECK_PACKAGE_VERSION(6.0 7.0)
 
   # 64 bit system?