[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.15 1.15.2.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/Preprocess
In directory public:/mounts/ram/cvs-serv13963/Tests/Preprocess

Modified Files:
      Tag: CMake-2-8
	CMakeLists.txt 
Log Message:
Merge in changes for RC 3


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Preprocess/CMakeLists.txt,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C 2 -d -r1.15 -r1.15.2.1
*** CMakeLists.txt	13 Jul 2009 20:58:24 -0000	1.15
--- CMakeLists.txt	9 Oct 2009 20:11:47 -0000	1.15.2.1
***************
*** 118,123 ****
  
  set(EXPR_OP1 "/")
! if(NOT MSVC OR PP_NMAKE)
!   # MSVC cl: %
    # When the cl compiler is invoked from the command line then % must
    # be written %% (to distinguish from %ENV% syntax).  However cl does
--- 118,124 ----
  
  set(EXPR_OP1 "/")
! if((NOT MSVC OR PP_NMAKE) AND
!    NOT "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
!   # MSVC cl, Intel icl: %
    # When the cl compiler is invoked from the command line then % must
    # be written %% (to distinguish from %ENV% syntax).  However cl does
***************
*** 129,135 ****
    # file.  Supporting other make tools would require CMake to generate
    # response files explicitly for each object file.
    set(STRING_EXTRA "${STRING_EXTRA}%")
    set(EXPR_OP1 "%")
! endif(NOT MSVC OR PP_NMAKE)
  
  # General: \"
--- 130,141 ----
    # file.  Supporting other make tools would require CMake to generate
    # response files explicitly for each object file.
+   #
+   # When the icl compiler is invoked from the command line then % must
+   # be written just '%'.  However nmake requires '%%' except when using
+   # response files.  Currently we have no way to affect escaping based
+   # on whether flags go in a response file, so we just have to skip it.
    set(STRING_EXTRA "${STRING_EXTRA}%")
    set(EXPR_OP1 "%")
! endif()
  
  # General: \"