[Orxonox-commit 5021] r9687 - code/trunk/cmake

[landauf at orxonox.net]

Author: landauf
Date: 2013-10-03 23:34:34 +0200 (Thu, 03 Oct 2013)
New Revision: 9687

Modified:
   code/trunk/cmake/LibraryConfig.cmake
   code/trunk/cmake/PackageConfig.cmake
   code/trunk/cmake/PackageConfigMinGW.cmake
Log:
support precompiled dependencies v7.0 for mingw (which use boost for threading in ogre)

Modified: code/trunk/cmake/LibraryConfig.cmake
===================================================================
--- code/trunk/cmake/LibraryConfig.cmake	2013-10-03 21:17:47 UTC (rev 9686)
+++ code/trunk/cmake/LibraryConfig.cmake	2013-10-03 21:34:34 UTC (rev 9687)
@@ -176,7 +176,7 @@
   SET(OGRE_LIBRARY ${OGRE_LIBRARY} ${POCO_LIBRARY})
 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()
 
 

Modified: code/trunk/cmake/PackageConfig.cmake
===================================================================
--- code/trunk/cmake/PackageConfig.cmake	2013-10-03 21:17:47 UTC (rev 9686)
+++ code/trunk/cmake/PackageConfig.cmake	2013-10-03 21:34:34 UTC (rev 9687)
@@ -32,7 +32,13 @@
 # Ogre versions >= 1.7 require the POCO library on Windows with MSVC for threading
 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()
 
 # Include paths and other special treatments

Modified: code/trunk/cmake/PackageConfigMinGW.cmake
===================================================================
--- code/trunk/cmake/PackageConfigMinGW.cmake	2013-10-03 21:17:47 UTC (rev 9686)
+++ code/trunk/cmake/PackageConfigMinGW.cmake	2013-10-03 21:34:34 UTC (rev 9687)
@@ -28,7 +28,7 @@
 IF(MINGW)
 
   INCLUDE(CheckPackageVersion)
-  CHECK_PACKAGE_VERSION(6.0)
+  CHECK_PACKAGE_VERSION(6.0 7.0)
 
   # 64 bit system?
   IF(CMAKE_SIZEOF_VOID_P EQUAL 8)