Changeset 6412 for code/branches/pickup2/cmake/PrecompiledHeaderFiles.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/PrecompiledHeaderFiles.cmake (modified) (3 diffs)

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}