Changeset 1123

Timestamp:

Apr 21, 2008, 9:24:30 PM (17 years ago)

Author:

rgrieder

Message:

• cmake is now capable of building to a specified directory. That means the src directory stays clean.

To use this, create a new directory (e.g. build/), switch to it and write:
cmake orxonox_root_path #e.g. 'cmake ..', when you create myBranch/build
make

• the header files specified in tolua.pkg are now relative to the src/ directory

• removed verbose make output (much better sight on gcc warnings and build process) If you need verbose output: 'cmake -D make_verb:1 path'

Location:

code/branches/cmake

Files:

• CMakeLists.txt (modified) (2 diffs)
• src/tolua/CMakeLists.txt (modified) (1 diff)
• src/tolua/tolua.pkg (modified) (1 diff)

code/branches/cmake/CMakeLists.txt

@@ -32 +32 @@
 
 #set binary output directories
-SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-SET(LIBRARY_OUTPUT_PATH    ${PROJECT_BINARY_DIR}/bin/lib)
+SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
+SET(LIBRARY_OUTPUT_PATH    ${PROJECT_SOURCE_DIR}/bin/lib)
 
 # global compiler/linker flags. force -O2!
@@ -43 +43 @@
 SET(CMAKE_MODULE_LINKER_FLAGS " --no-undefined")
 
-#Create verbose makefile output when compiling
-SET(CMAKE_VERBOSE_MAKEFILE TRUE)
+#use 'cmake -D make_verb:1 path' to get verbose make output when compiling
+IF (MAKE_VERB)
+ SET(CMAKE_VERBOSE_MAKEFILE TRUE)
+ENDIF (MAKE_VERB)
 
 

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

@@ -41 +41 @@
 ADD_CUSTOM_COMMAND(
   OUTPUT tolua_bind.h tolua_bind.cc
-  COMMAND ${TOLUA_EXE} -n orxonox -o ../../src/tolua/tolua_bind.cc -H ../../src/tolua/tolua_bind.h ../../src/tolua/tolua.pkg
+  COMMAND ${TOLUA_EXE} -n orxonox -o tolua/tolua_bind.cc -H tolua/tolua_bind.h tolua/tolua.pkg
   DEPENDS tolua
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin/lib
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src
 )
 

code/branches/cmake/src/tolua/tolua.pkg

@@ -1 @@
-$cfile "../../src/core/Script_clean.h"
+$cfile "core/Script_clean.h"