Changeset 1211 for code/branches/camera/src/util/CMakeLists.txt

Timestamp:

May 1, 2008, 6:09:05 PM (17 years ago)

Author:

scheusso

Message:

merged trunk changes from 1101 to 1202 into camera branch

File:

• code/branches/camera/src/util/CMakeLists.txt (modified) (3 diffs)

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

@@ -1 @@
-AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES)
-
-SET (UTIL_SRC_FILES
+SET(UTIL_SRC_FILES
   ArgReader.cc
+  Clipboard.cc
+  ExprParser.cc
   Math.cc
-  String.cc
-  Clipboard.cc
-  SubString.cc
   MultiTypePrimitive.cc
   MultiTypeString.cc
   MultiTypeMath.cc
+  String.cc
+  SubString.cc
+
+  tinyxml/ticpp.cc
+  tinyxml/tinystr.cc
+  tinyxml/tinyxml.cc
+  tinyxml/tinyxmlerror.cc
+  tinyxml/tinyxmlparser.cc
+
   tolua/tolua_event.c
   tolua/tolua_is.c
@@ -15 +21 @@
   tolua/tolua_push.c
   tolua/tolua_to.c
-  ${TINYXML_SRC_FILES}
 )
 
-ADD_LIBRARY( util SHARED ${UTIL_SRC_FILES} )
+ADD_LIBRARY(util SHARED ${UTIL_SRC_FILES})
 
 IF(TESTING_ENABLED)
@@ -24 +29 @@
 ENDIF(TESTING_ENABLED)
 
-TARGET_LINK_LIBRARIES( util
+TARGET_LINK_LIBRARIES(util
   ${OGRE_LIBRARIES}
   ${Lua_LIBRARIES}
-  ${Lua_LIBRARY}
 ) 
 
+ADD_SUBDIRECTORY(tolua)
+