Changeset 6417 for code/trunk/cmake

Timestamp:

Dec 25, 2009, 10:23:58 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation2 branch back to trunk.
Major new features:

• Actual GUI with settings, etc.
• Improved space ship steering (human interaction)
• Rocket fire and more particle effects
• Advanced sound framework

Location:

code/trunk

Files:

• . (modified) (1 prop)
• 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) (1 diff)

code/trunk/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/trunk/cmake/FindPackageHandleAdvancedArgs.cmake

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

code/trunk/cmake/LibraryConfig.cmake

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

code/trunk/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/trunk/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/trunk/cmake/SourceFileUtilities.cmake

@@ -75 +75 @@
       IF(_compile AND NOT DISABLE_COMPILATIONS)
         LIST(APPEND _compilation ${_filepath})
-        LIST(APPEND _fullpath_sources "H")
+        LIST(APPEND _fullpath_sources "H")
       ENDIF()
     ENDIF()