Changeset 2198 for code/branches/buildsystem/src

Timestamp:

Nov 12, 2008, 4:08:51 PM (16 years ago)

Author:

adrfried

Message:

FindOGRE cleaned up

Location:

code/branches/buildsystem/src

Files:

• CMakeLists.txt (modified) (1 diff)
• core/CMakeLists.txt (modified) (1 diff)
• network/CMakeLists.txt (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)
• util/CMakeLists.txt (modified) (1 diff)

code/branches/buildsystem/src/CMakeLists.txt

@@ -14 +14 @@
   ${DirectX_INCLUDE_DIR}
   ${ZLIB_INCLUDE_DIR}
-)
-
-# TODO: remove this after the CMake Modules have been fixed and use absolut paths
-# Set the search paths for the linking
-LINK_DIRECTORIES(
-  ${OGRE_LIB_DIR}
 )
 

code/branches/buildsystem/src/core/CMakeLists.txt

@@ -59 +59 @@
 
 TARGET_LINK_LIBRARIES(core
-  ${OGRE_LIBRARIES}
+  ${OGRE_LIBRARY}
   ${Boost_THREAD_LIBRARY}
   ${Boost_FILESYSTEM_LIBRARY}

code/branches/buildsystem/src/network/CMakeLists.txt

@@ -41 +41 @@
   ADD_EXECUTABLE(networktest ${TEST_SRC_FILES})
   TARGET_LINK_LIBRARIES( networktest
-    ${OGRE_LIBRARIES}
+    ${OGRE_LIBRARY}
     network
     ${ENet_LIBRARIES}

code/branches/buildsystem/src/orxonox/CMakeLists.txt

@@ -91 +91 @@
 
 TARGET_LINK_LIBRARIES( orxonox
-  ${OGRE_LIBRARIES}
+  ${OGRE_LIBRARY}
   ${CEGUI_LIBRARY}
   ${LUA_LIBRARIES}

code/branches/buildsystem/src/util/CMakeLists.txt

@@ -13 +13 @@
 
 ADD_LIBRARY(util SHARED ${UTIL_SRC_FILES})
-TARGET_LINK_LIBRARIES(util ${OGRE_LIBRARIES})
+TARGET_LINK_LIBRARIES(util ${OGRE_LIBRARY})
 
 ADD_SUBDIRECTORY(testing)