Changeset 2197 for code/branches/buildsystem/src

Timestamp:

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

Author:

adrfried

Message:

FindCEGUI.cmake and others cleaned up

Location:

code/branches/buildsystem/src

Files:

• CMakeLists.txt (modified) (3 diffs)
• ceguilua-0.5.0/ceguilua/CMakeLists.txt (modified) (1 diff)
• ceguilua-0.6.1/ceguilua/CMakeLists.txt (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)
• util/CMakeLists.txt (modified) (1 diff)
• util/testing/CMakeLists.txt (modified) (1 diff)

code/branches/buildsystem/src/CMakeLists.txt

@@ -16 +16 @@
 )
 
+# TODO: remove this after the CMake Modules have been fixed and use absolut paths
 # Set the search paths for the linking
-# TODO: remove this after the CMake Modules have been fixed and use absolut paths
 LINK_DIRECTORIES(
   ${OGRE_LIB_DIR}
-  ${CEGUI_LIB_DIR}
 )
 
@@ -33 +32 @@
 ADD_SUBDIRECTORY(ois)
 ADD_SUBDIRECTORY(tinyxml)
-#ADD_SUBDIRECTORY(lua)
 ADD_SUBDIRECTORY(tolua)
 
@@ -46 +44 @@
     INCLUDE_DIRECTORIES(ceguilua-0.6.1)
 ELSE (WIN32)
-    IF (${CEGUI_VERSION} LESS 0.6.0)
+    # FIXME
+    #IF (${CEGUI_VERSION} LESS 0.6.0)
         ADD_SUBDIRECTORY(ceguilua-0.5.0/ceguilua)
         INCLUDE_DIRECTORIES(ceguilua-0.5.0)
-    ELSE (${CEGUI_VERSION} LESS 0.6.0)
-        ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
-        INCLUDE_DIRECTORIES(ceguilua-0.6.1)
-    ENDIF (${CEGUI_VERSION} LESS 0.6.0)
+    #ELSE (${CEGUI_VERSION} LESS 0.6.0)
+    #    ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
+    #    INCLUDE_DIRECTORIES(ceguilua-0.6.1)
+    #ENDIF (${CEGUI_VERSION} LESS 0.6.0)
 ENDIF (WIN32)
 

code/branches/buildsystem/src/ceguilua-0.5.0/ceguilua/CMakeLists.txt

@@ -11 +11 @@
   tolualib_orxonox
   ${LUA_LIBRARIES}
-  ${CEGUI_LIBRARIES}
+  ${CEGUI_LIBRARY}
 )

code/branches/buildsystem/src/ceguilua-0.6.1/ceguilua/CMakeLists.txt

@@ -11 +11 @@
   tolualib_orxonox
   ${LUA_LIBRARIES}
-  ${CEGUI_LIBRARIES}
+  ${CEGUI_LIBRARY}
 )

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

@@ -92 +92 @@
 TARGET_LINK_LIBRARIES( orxonox
   ${OGRE_LIBRARIES}
-  ${CEGUI_LIBRARIES}
+  ${CEGUI_LIBRARY}
   ${LUA_LIBRARIES}
   #${CEGUI_SCRIPT_LIBRARIES}

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

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

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

@@ -1 @@
-INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES}
-        ../
-)
+INCLUDE_DIRECTORIES(..)
 
-ADD_EXECUTABLE(TestConverter
- TestConverter.cpp
-)
+IF(ENABLE_TESTS)
+  ADD_EXECUTABLE(TestConverter TestConverter.cpp)
+ENDIF(ENABLE_TESTS)
 
-
-ADD_TEST(TestConverter
-        ${EXECUTABLE_OUTPUT_PATH}/TestConverter
-)
+ADD_TEST(TestConverter ${EXECUTABLE_OUTPUT_PATH}/TestConverter)