Changeset 2510 for code/branches/buildsystem2/src

Timestamp:

Dec 17, 2008, 9:05:10 PM (17 years ago)

Author:

rgrieder

Message:

Merged revisions 2279-2401 of the buildsystem branch to buildsystem2.

Location:

code/branches/buildsystem2

Files:

• . (modified) (1 prop)
• src/CMakeLists.txt (modified) (2 diffs)
• src/audio/CMakeLists.txt (modified) (1 diff)
• src/ceguilua-0.5.0/ceguilua/CMakeLists.txt (modified) (1 diff)
• src/ceguilua-0.6.1/ceguilua/CMakeLists.txt (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (1 diff)
• src/core/LuaBind.cc (modified) (1 prop)
• src/core/LuaBind.h (modified) (1 prop)
• src/core/XMLIncludes.h (modified) (1 prop)
• src/cpptcl/CMakeLists.txt (modified) (1 diff)
• src/network/CMakeLists.txt (modified) (1 diff)
• src/ois/CMakeLists.txt (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/tinyxml/CMakeLists.txt (modified) (1 diff)
• src/tolua/CMakeLists.txt (modified) (3 diffs)
• src/tolua/all-5.0.lua (modified) (1 prop)
• src/tolua/all-5.1.lua (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)

code/branches/buildsystem2/src/CMakeLists.txt

@@ -33 +33 @@
 ADD_SUBDIRECTORY(tolua)
 
-# TODO: write include file for this stuff
+# TODO: FIXME
 # Some people may not have CEGUILua installed, espc. with version 0.5
 # And we don't know what lua version it was linked against, so we compile
@@ -41 +41 @@
 IF (WIN32)
     ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
-    INCLUDE_DIRECTORIES(ceguilua-0.6.1)
+    INCLUDE_DIRECTORIES(ceguilua-0.6.1/ceguilua)
 ELSE (WIN32)
     # FIXME
     #IF (${CEGUI_VERSION} LESS 0.6.0)
         ADD_SUBDIRECTORY(ceguilua-0.5.0/ceguilua)
-        INCLUDE_DIRECTORIES(ceguilua-0.5.0)
+        INCLUDE_DIRECTORIES(ceguilua-0.5.0/ceguilua)
     #ELSE (${CEGUI_VERSION} LESS 0.6.0)
     #    ADD_SUBDIRECTORY(ceguilua-0.6.1/ceguilua)
-    #    INCLUDE_DIRECTORIES(ceguilua-0.6.1)
+    #    INCLUDE_DIRECTORIES(ceguilua-0.6.1/ceguilua)
     #ENDIF (${CEGUI_VERSION} LESS 0.6.0)
 ENDIF (WIN32)

code/branches/buildsystem2/src/audio/CMakeLists.txt

@@ -21 +21 @@
 )
 
-
+INSTALL(TARGETS audio LIBRARY DESTINATION lib)

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

@@ -13 +13 @@
   ${CEGUI_LIBRARY}
 )
+
+INSTALL(TARGETS ceguilua_orxonox LIBRARY DESTINATION lib)

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

@@ -13 +13 @@
   ${CEGUI_LIBRARY}
 )
+
+INSTALL(TARGETS ceguilua_orxonox LIBRARY DESTINATION lib)

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

@@ -62 +62 @@
   util
 )
+
+INSTALL(TARGETS core LIBRARY DESTINATION lib)

code/branches/buildsystem2/src/cpptcl/CMakeLists.txt

@@ -4 +4 @@
   ${TCL_LIBRARY}
 )
+
+INSTALL(TARGETS cpptcl_orxonox LIBRARY DESTINATION lib)

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

@@ -30 +30 @@
 )
 
+INSTALL(TARGETS network LIBRARY DESTINATION lib)
 
 # build those parts only on request.

code/branches/buildsystem2/src/ois/CMakeLists.txt

@@ -46 +46 @@
 ENDIF(WIN32)
 
+INSTALL(TARGETS ois_orxonox LIBRARY DESTINATION lib)

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

@@ -44 +44 @@
   network
 )
+
+INSTALL(TARGETS orxonox RUNTIME DESTINATION bin)

code/branches/buildsystem2/src/tinyxml/CMakeLists.txt

@@ -8 +8 @@
 
 ADD_LIBRARY(tinyxml_orxonox SHARED ${TINYXML_SRC_FILES})
+INSTALL(TARGETS tinyxml_orxonox LIBRARY DESTINATION lib)

code/branches/buildsystem2/src/tolua/CMakeLists.txt

@@ -1 @@
-SET(TOLUALIB_SRC_FILES
+ADD_LIBRARY(tolualib_orxonox STATIC
   tolua_event.c
   tolua_is.c
@@ -7 +7 @@
 )
 
-ADD_LIBRARY          (tolualib_orxonox SHARED ${TOLUALIB_SRC_FILES})
 TARGET_LINK_LIBRARIES(tolualib_orxonox ${LUA_LIBRARIES})
 
+#INSTALL(TARGETS tolualib_orxonox LIBRARY DESTINATION lib)
 
 SET(TOLUAGEN_SRC_FILES
@@ -15 +15 @@
 )
 
-ADD_EXECUTABLE       (toluaexe_orxonox ${TOLUAGEN_SRC_FILES})
+ADD_EXECUTABLE(toluaexe_orxonox ${TOLUAGEN_SRC_FILES})
 TARGET_LINK_LIBRARIES(toluaexe_orxonox tolualib_orxonox ${LUA_LIBRARIES})
 
-# TODO: determine lua version and set appropriate pack file
-SET(TOLUA_ALL_PACK all-5.1.lua)
+#IF("${LUA_VERSION}" VERSION_LESS 5.1)
+IF("${LUA_VERSION}" MATCHES "^5.0")
+  SET(TOLUA_ALL_PACK all-5.0.lua)
+#ELSE("${LUA_VERSION}" VERSION_LESS 5.1)
+ELSE("${LUA_VERSION}" MATCHES "^5.0")
+  SET(TOLUA_ALL_PACK all-5.1.lua)
+#ENDIF("${LUA_VERSION}" VERSION_LESS 5.1)
+ENDIF("${LUA_VERSION}" MATCHES "^5.0")
+
 SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/${TOLUA_ALL_PACK}" PARENT_SCOPE)
 SET(TOLUA_PARSER_DEPENDENCIES

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

@@ -15 +15 @@
 ADD_LIBRARY(util SHARED ${UTIL_SRC_FILES})
 TARGET_LINK_LIBRARIES(util ${OGRE_LIBRARY})
+INSTALL(TARGETS util LIBRARY DESTINATION lib)
 
 )