Changeset 2599 for code/branches

Timestamp:

Jan 29, 2009, 6:59:19 PM (16 years ago)

Author:

rgrieder

Message:

• Added orxonox version info. However I don't exactly what the actual is now, so please correct me if I'm wrong.
• Small changes and fixes

Location:

code/branches/buildsystem2

Files:

• CMakeLists.txt (modified) (3 diffs)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/tolua/CMakeLists.txt (modified) (2 diffs)

code/branches/buildsystem2/CMakeLists.txt

@@ -1 @@
-PROJECT(Orxonox)
+PROJECT(Orxonox C CXX)
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
 
-############### Various Options #################
+SET(ORXONOX_VERSION_MAJOR 0)
+SET(ORXONOX_VERSION_MINOR 1)
+SET(ORXONOX_VERSION_PATCH 0)
+SET(ORXONOX_VERSION 0.1.0)
 
 # Keep devs from using the root directory as binary directory (messes up the source tree)
@@ -11 +14 @@
 
 # This sets where to look for modules (e.g. "Find*.cmake" files)
-SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 # Set binary output directories
@@ -91 +94 @@
 
 ADD_SUBDIRECTORY(src)
+
+# Configure the binary output directory
 ADD_SUBDIRECTORY(bin-config)

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

@@ -27 +27 @@
 GET_TARGET_PROPERTY(_exec_loc orxonox LOCATION)
 GET_FILENAME_COMPONENT(_exec_name ${_exec_loc} NAME)
-SET(ORXONOX_EXECUTABLE_NAME ${_exec_name} CACHE STRING "")
-MARK_AS_ADVANCED(ORXONOX_EXECUTABLE_NAME)
+SET(ORXONOX_EXECUTABLE_NAME ${_exec_name} CACHE INTERNAL "")
 
 IF(NETWORKTRAFFIC_TESTING_ENABLED)
 
-  SET( ORXONOXS_SRC_FILES
+  SET(ORXONOXS_SRC_FILES
     GraphicsEngine.cc
     objects/Camera.cc
@@ -38 +37 @@
   )
 
-  ADD_LIBRARY(orxonoxs SHARED ${ORXONOX_SRC_FILES})
+  ADD_LIBRARY(orxonoxs SHARED ${ORXONOXS_SRC_FILES})
 ENDIF(NETWORKTRAFFIC_TESTING_ENABLED)
 

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

@@ -32 +32 @@
 
 # Set some variables to the cache in order to use them in the TOLUA macro
-SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/${TOLUA_ALL_PACK}" CACHE STRING "")
+SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/${TOLUA_ALL_PACK}" CACHE INTERNAL "")
 SET(TOLUA_PARSER_DEPENDENCIES
   toluaexe_orxonox
@@ -58 +58 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/lua/doit.lua
 
-  CACHE STRING ""
+  CACHE INTERNAL ""
 )
-MARK_AS_ADVANCED(TOLUA_PARSER_SOURCE TOLUA_PARSER_DEPENDENCIES)