Changeset 2197 for code/branches/buildsystem/src/util

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/util

Files:

• CMakeLists.txt (modified) (1 diff)
• testing/CMakeLists.txt (modified) (1 diff)

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)