Changeset 6412 for code/branches/pickup2/cmake

Timestamp:

Dec 25, 2009, 1:18:03 PM (15 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• cmake/CompilerConfigMSVC.cmake (modified) (1 diff)
• cmake/FindLua.cmake (modified) (1 diff)
• cmake/FindPackageHandleAdvancedArgs.cmake (modified) (1 diff)
• cmake/LibraryConfig.cmake (modified) (1 diff)
• cmake/LibraryConfigApple.cmake (modified) (1 diff)
• cmake/PrecompiledHeaderFiles.cmake (modified) (3 diffs)
• cmake/SourceFileUtilities.cmake (modified) (2 diffs)
• cmake/TargetUtilities.cmake (modified) (3 diffs)

code/branches/pickup2/cmake/CompilerConfigMSVC.cmake

@@ -149 +149 @@
 # Use Link time code generation for Release config if ORXONOX_RELEASE is defined
 IF(ORXONOX_RELEASE)
+  REMOVE_COMPILER_FLAGS("-INCREMENTAL:YES" ReleaseAll CACHE)
   ADD_LINKER_FLAGS("-LTCG" ReleaseAll CACHE)
 ENDIF()

code/branches/pickup2/cmake/FindLua.cmake

@@ -136 +136 @@
       ENDIF()
     ENDIF(${LUA_5.0_LUA_LIBRARY} MATCHES "framework")
-    
+
     IF(LUA_5.0_LIBRARIES)
       SET(LUA_5.0_FOUND TRUE)

code/branches/pickup2/cmake/FindPackageHandleAdvancedArgs.cmake

@@ -25 +25 @@
  #    EXACT keyword if specified in FIND_PACKAGE(...).
  #
- 
+
 INCLUDE(FindPackageHandleStandardArgs)
 INCLUDE(CompareVersionStrings)

code/branches/pickup2/cmake/LibraryConfig.cmake

@@ -25 +25 @@
  #    for certain libraries (Boost, OpenAL, TCL)
  #
- 
+
 INCLUDE(CompareVersionStrings)
 INCLUDE(FindPackageHandleStandardArgs)

code/branches/pickup2/cmake/LibraryConfigApple.cmake

@@ -23 +23 @@
  #    Sets necessary library options and paths on Mac.
  #
- 
+
 IF(APPLE)
   MESSAGE(STATUS "Running on Apple. Using customized paths and options.")

code/branches/pickup2/cmake/PrecompiledHeaderFiles.cmake

@@ -23 +23 @@
 
 INCLUDE(GetGCCCompilerFlags)
- 
+
 MACRO(PRECOMPILED_HEADER_FILES_PRE_TARGET _target_name _header_file_arg _sourcefile_var)
 
@@ -94 +94 @@
           SET(_old_flags "")
         ENDIF()
-        SET_SOURCE_FILES_PROPERTIES(${_file} PROPERTIES COMPILE_FLAGS "${_old_flags} /FI\"${_pch_header_file}\" /Yu\"${_pch_header_file}\" /Fp\"${_pch_file}\"")
+        SET_SOURCE_FILES_PROPERTIES(${_file} PROPERTIES COMPILE_FLAGS "${_old_flags} /FI\"${_pch_header_file}\" /Yu\"${_pch_header_file}\" /Fp\"${_pch_file}\"")
       ENDIF(NOT _is_header)
     ENDFOREACH(_file)
@@ -152 +152 @@
         COMMAND ${CMAKE_CXX_COMPILER}
         ARGS ${pchsupport_compiler_cxx_arg1} ${_pch_gcc_flags} -c -x c++-header -o ${_pch_file} ${_pch_header_file}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         DEPENDS ${_pch_dep_helper_file}
         IMPLICIT_DEPENDS CXX ${_pch_header_file}

code/branches/pickup2/cmake/SourceFileUtilities.cmake

@@ -48 +48 @@
       ENDIF()
       IF(NOT DISABLE_COMPILATIONS)
+        SET(_compilation_file ${CMAKE_CURRENT_BINARY_DIR}/${_compilation_name})
         SET(_include_string)
         FOREACH(_file2 ${_compilation})
           SET(_include_string "${_include_string}#include \"${_file2}\"\n")
         ENDFOREACH(_file2)
-        IF(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${_compilation_name})
-          FILE(READ ${CMAKE_CURRENT_BINARY_DIR}/${_compilation_name} _include_string_file)
+        IF(EXISTS ${_compilation_file})
+          FILE(READ ${_compilation_file} _include_string_file)
         ENDIF()
         IF(NOT _include_string STREQUAL "${_include_string_file}")
-          FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_compilation_name} "${_include_string}")
+          FILE(WRITE ${_compilation_file} "${_include_string}")
         ENDIF()
-        LIST(APPEND _fullpath_sources ${CMAKE_CURRENT_BINARY_DIR}/${_compilation_name})
+        LIST(APPEND _fullpath_sources ${_compilation_file})
+        # MSVC hack that excludes the compilations from the intellisense database
+        # (There is a bug with the "-" instead of "/". Only works for "Zm#" argument)
+        IF(MSVC)
+          SET_SOURCE_FILES_PROPERTIES(${_compilation_file} PROPERTIES COMPILE_FLAGS "-Zm1000")
+        ENDIF()
       ENDIF()
       SET(_compilation_name)
@@ -69 +75 @@
       IF(_compile AND NOT DISABLE_COMPILATIONS)
         LIST(APPEND _compilation ${_filepath})
-        LIST(APPEND _fullpath_sources "H")
+        LIST(APPEND _fullpath_sources "H")
       ENDIF()
     ENDIF()

code/branches/pickup2/cmake/TargetUtilities.cmake

@@ -181 +181 @@
   ENDFOREACH(_file)
 
+
+
   # Add the library/executable
   IF("${_target_type}" STREQUAL "LIBRARY")
@@ -190 +192 @@
   ENDIF()
 
+
+
   # Change library prefix to "lib"
   IF(MSVC AND ${_target_type} STREQUAL "LIBRARY")
@@ -195 +199 @@
       PREFIX "lib"
     )
+  ENDIF()
+
+  # MSVC hack to exclude external library sources from the intellisense database
+  # (IntelliSense stops working when adding "-Zm1000" as compile flag. "/Zm1000"
+  # would not work because of the slash)
+  IF(_arg_ORXONOX_EXTERNAL AND MSVC)
+    SET_TARGET_PROPERTIES(${_target_name} PROPERTIES COMPILE_FLAGS "-Zm1000")
   ENDIF()