[Orxonox-commit 3264] r7955 - in code/trunk: cmake src

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-02-24 07:36:44 +0100 (Thu, 24 Feb 2011)
New Revision: 7955

Modified:
   code/trunk/cmake/LibraryConfig.cmake
   code/trunk/src/CMakeLists.txt
Log:
No auto-linking for POCO too.
Fixed build by explicitly linking against PCOO with OGRE together.

Modified: code/trunk/cmake/LibraryConfig.cmake
===================================================================
--- code/trunk/cmake/LibraryConfig.cmake	2011-02-24 06:35:28 UTC (rev 7954)
+++ code/trunk/cmake/LibraryConfig.cmake	2011-02-24 06:36:44 UTC (rev 7955)
@@ -100,6 +100,8 @@
 FIND_PACKAGE(ZLIB            REQUIRED)
 IF(POCO_REQUIRED)
   FIND_PACKAGE(POCO          REQUIRED)
+  # Always link against POCO too because of threading
+  SET(OGRE_LIBRARY ${OGRE_LIBRARY} ${POCO_LIBRARY})
 ENDIF()
 IF(WIN32)
   FIND_PACKAGE(DbgHelp)

Modified: code/trunk/src/CMakeLists.txt
===================================================================
--- code/trunk/src/CMakeLists.txt	2011-02-24 06:35:28 UTC (rev 7954)
+++ code/trunk/src/CMakeLists.txt	2011-02-24 06:36:44 UTC (rev 7955)
@@ -32,8 +32,9 @@
 
 ####### Library Behaviour (dependencies) ########
 
-# Disable Boost auto linking completely
+# Disable auto linking completely for Boost and POCO
 ADD_COMPILER_FLAGS("-DBOOST_ALL_NO_LIB")
+ADD_COMPILER_FLAGS("-DPOCO_NO_AUTOMATIC_LIBS")
 
 # If no defines are specified, these libs get linked statically
 ADD_COMPILER_FLAGS("-DBOOST_ALL_DYN_LINK" WIN32 LINK_BOOST_DYNAMIC)