[Orxonox-commit 858] r3368 - in trunk: cmake src src/tolua

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-07-30 13:50:39 +0200 (Thu, 30 Jul 2009)
New Revision: 3368

Modified:
   trunk/cmake/GenerateToluaBindings.cmake
   trunk/cmake/TargetUtilities.cmake
   trunk/src/CMakeLists.txt
   trunk/src/tolua/CMakeLists.txt
Log:
Added NO_INSTALL argument for ORXONOX_ADD_EXECUTABLE/LIBRARY and moved "-DTOLUA_RELEASE" from the global definitions to the tolua bind source files.

Modified: trunk/cmake/GenerateToluaBindings.cmake
===================================================================
--- trunk/cmake/GenerateToluaBindings.cmake	2009-07-29 21:47:22 UTC (rev 3367)
+++ trunk/cmake/GenerateToluaBindings.cmake	2009-07-30 11:50:39 UTC (rev 3368)
@@ -51,6 +51,10 @@
   IF(CMAKE_COMPILER_IS_GNU)
     SET_SOURCE_FILES_PROPERTIES(${_tolua_cxxfile} PROPERTIES COMPILE_FLAGS "-w")
   ENDIF()
+  # Tolua binding speedup if required
+  IF(ORXONOX_RELEASE)
+    SET_SOURCE_FILES_PROPERTIES(${_tolua_cxxfile} PROPERTIES COMPILE_FLAGS "-DTOLUA_RELEASE")
+  ENDIF()
 
   # Create temporary package file and implicit dependencies
   FILE(REMOVE ${_tolua_pkgfile})

Modified: trunk/cmake/TargetUtilities.cmake
===================================================================
--- trunk/cmake/TargetUtilities.cmake	2009-07-29 21:47:22 UTC (rev 3367)
+++ trunk/cmake/TargetUtilities.cmake	2009-07-30 11:50:39 UTC (rev 3368)
@@ -172,7 +172,7 @@
     PRECOMPILED_HEADER_FILES_POST_TARGET(${_target_name} ${_arg_PCH_FILE})
   ENDIF()
 
-  IF(NOT _arg_STATIC)
+  IF(NOT _arg_STATIC AND NOT _arg_NO_INSTALL)
     INSTALL(TARGETS ${_target_name}
       RUNTIME DESTINATION ${ORXONOX_RUNTIME_INSTALL_PATH}
       LIBRARY DESTINATION ${ORXONOX_LIBRARY_INSTALL_PATH}

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2009-07-29 21:47:22 UTC (rev 3367)
+++ trunk/src/CMakeLists.txt	2009-07-30 11:50:39 UTC (rev 3368)
@@ -27,8 +27,6 @@
 ADD_COMPILER_FLAGS("-DTIXML_USE_TICPP")
 # OIS dynamic linking requires macro definition, at least for Windows
 ADD_COMPILER_FLAGS("-DOIS_DYNAMIC_LIB")
-# Tolua binding speedup if required
-ADD_COMPILER_FLAGS("-DTOLUA_RELEASE" ORXONOX_RELEASE)
 
 ################ OrxonoxConfig.h ################
 

Modified: trunk/src/tolua/CMakeLists.txt
===================================================================
--- trunk/src/tolua/CMakeLists.txt	2009-07-29 21:47:22 UTC (rev 3367)
+++ trunk/src/tolua/CMakeLists.txt	2009-07-30 11:50:39 UTC (rev 3368)
@@ -54,6 +54,7 @@
   ORXONOX_EXTERNAL
   VERSION
     1.0.92
+  NO_INSTALL
   LINK_LIBRARIES
     ${LUA_LIBRARIES}
   SOURCE_FILES