Changeset 2530 for code/branches/bugger/src/util

Timestamp:

Dec 23, 2008, 10:40:38 PM (16 years ago)

Author:

rgrieder

Message:

merged revisions 2260 - 2508 from trunk to buggy.
I'm sorry that I have to commit every merge. But otherwise I get tons of conflicts I have to solve ten times over.
Note: did not merge deletion of src/util/testing, tortoise wasn't very friendly with that.

Location:

code/branches/bugger

Files:

• . (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/CMakeLists.txt (modified) (1 diff)
• src/util/Exception.cc (modified) (1 prop)
• src/util/Exception.h (modified) (1 prop)
• src/util/SignalHandler.cc (modified) (1 prop)
• src/util/SignalHandler.h (modified) (1 prop)

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

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