Changeset 3368

Timestamp:

Jul 30, 2009, 1:50:39 PM (15 years ago)

Author:

rgrieder

Message:

Added NO_INSTALL argument for ORXONOX_ADD_EXECUTABLE/LIBRARY and moved "-DTOLUA_RELEASE" from the global definitions to the tolua bind source files.

Location:

code/trunk

Files:

• cmake/GenerateToluaBindings.cmake (modified) (1 diff)
• cmake/TargetUtilities.cmake (modified) (1 diff)
• src/CMakeLists.txt (modified) (1 diff)
• src/tolua/CMakeLists.txt (modified) (1 diff)

code/trunk/cmake/GenerateToluaBindings.cmake

@@ -52 +52 @@
     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

code/trunk/cmake/TargetUtilities.cmake

@@ -173 +173 @@
   ENDIF()
 
-  IF(NOT _arg_STATIC)
+  IF(NOT _arg_STATIC AND NOT _arg_NO_INSTALL)
     INSTALL(TARGETS ${_target_name}
       RUNTIME DESTINATION ${ORXONOX_RUNTIME_INSTALL_PATH}

code/trunk/src/CMakeLists.txt

@@ -28 +28 @@
 # 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 ################

code/trunk/src/tolua/CMakeLists.txt

@@ -55 +55 @@
   VERSION
     1.0.92
+  NO_INSTALL
   LINK_LIBRARIES
     ${LUA_LIBRARIES}