Changeset 303 for code/branches/merger

Timestamp:

Nov 28, 2007, 9:13:34 AM (17 years ago)

Author:

nicolasc

Message:

minor fixes
add FindODE.cmake (if needed)

Location:

code/branches/merger

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/FindODE.cmake (added)
• src/CMakeLists.txt (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)

code/branches/merger/CMakeLists.txt

@@ -26 +26 @@
         MESSAGE("ERROR: uname terminated unclean.")
   ENDIF (NOT "${UNAME_RV}" STREQUAL "0")
-  # check wheter we are on a tardis machine
+# check wheter we are on a tardis INCLUDEmachine
   IF ("${UNAME_OV}" MATCHES "tardis")
     SET (IS_TARDIS "tardis")

code/branches/merger/src/CMakeLists.txt

@@ -4 +4 @@
 ADD_SUBDIRECTORY(loader)
 ADD_SUBDIRECTORY(network)
-# ADD_SUBDIRECTORY(hud)
-# ADD_SUBDIRECTORY(weapon)
 ADD_SUBDIRECTORY(class_hierarchy)
 
-
-# create a few variables to simplify life
-# SET( ORXONOX_SRC
-#       inertial_node.cc
-#       main.cc
-#       ogre_control.cc
-#       orxonox.cc
-#       orxonox_scene.cc
-#       orxonox_ship.cc
-#       run_manager.cc
-# )
-
-#Creates an executable
-# ADD_EXECUTABLE(../bin/main ${ORXONOX_SRC} )
-
-#add weapon source dir
-
-# ADD_SUBDIRECTORY(hud)
-
-#Links the executable against OGRE and OIS
-# TARGET_LINK_LIBRARIES(../bin/main
-#       WEAPON
-#       CLASS_HIERARCHY
-#       HUD
-#       ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES}
-# )
-
-#TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES})
-

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

@@ -3 +3 @@
 SET(SRC_FILES orxonox.cc)
 SET(INC_FILES)
-
 
 ADD_EXECUTABLE(../../bin/main ${SRC_FILES} ${INC_FILES})