Changeset 7955 for code/trunk

Timestamp:

Feb 24, 2011, 7:36:44 AM (14 years ago)

Author:

rgrieder

Message:

No auto-linking for POCO too.
Fixed build by explicitly linking against PCOO with OGRE together.

Location:

code/trunk

Files:

• cmake/LibraryConfig.cmake (modified) (1 diff)
• src/CMakeLists.txt (modified) (1 diff)

code/trunk/cmake/LibraryConfig.cmake

@@ -101 +101 @@
 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)

code/trunk/src/CMakeLists.txt

@@ -33 +33 @@
 ####### 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