Changeset 1126 for code/trunk/src

Timestamp:

Apr 22, 2008, 12:37:40 PM (17 years ago)

Author:

rgrieder

Message:

• merged cmake branch back to trunk
• new 'features': out-of-source build, no verbose make output, rewrite of FindLua.cmake

Location:

code/trunk/src

Files:

• core/CMakeLists.txt (modified) (1 diff)
• tolua/CMakeLists.txt (modified) (3 diffs)
• tolua/tolua.pkg (modified) (1 diff)

code/trunk/src/core/CMakeLists.txt

@@ -34 +34 @@
   tolualib
   ${Lua_LIBRARIES}
-  ${Lua_LIBRARY}
   ${OIS_LIBRARIES}
 )

code/trunk/src/tolua/CMakeLists.txt

@@ -14 +14 @@
 TARGET_LINK_LIBRARIES(tolua
   ${Lua_LIBRARIES}
-  ${Lua_LIBRARY}
   m
 )
@@ -41 +40 @@
 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
 )
 
@@ -50 +49 @@
 TARGET_LINK_LIBRARIES(tolualib
   ${Lua_LIBRARIES}
-  ${Lua_LIBRARY}
 )
 

code/trunk/src/tolua/tolua.pkg

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