[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.12 1.12.2.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/BuildDepends
In directory public:/mounts/ram/cvs-serv18987/Tests/BuildDepends

Modified Files:
      Tag: CMake-2-8
	CMakeLists.txt 
Log Message:
RC 4 merge


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/BuildDepends/CMakeLists.txt,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C 2 -d -r1.12 -r1.12.2.1
*** CMakeLists.txt	14 May 2008 15:55:12 -0000	1.12
--- CMakeLists.txt	28 Oct 2009 16:15:44 -0000	1.12.2.1
***************
*** 29,32 ****
--- 29,38 ----
  endfunction(help_xcode_depends)
  
+ # The Intel compiler causes the MSVC linker to crash during
+ # incremental linking, so avoid the /INCREMENTAL:YES flag.
+ if(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel")
+   set(_cmake_options "-DCMAKE_EXE_LINKER_FLAGS=")
+ endif()
+ 
  file(MAKE_DIRECTORY ${BuildDepends_BINARY_DIR}/Project)
  message("Creating Project/foo.cxx")
***************
*** 50,53 ****
--- 56,60 ----
    ${BuildDepends_SOURCE_DIR}/Project
    testRebuild
+   CMAKE_FLAGS ${_cmake_options}
    OUTPUT_VARIABLE OUTPUT)
  if(HELP_XCODE)
***************
*** 64,69 ****
  endif(HELP_XCODE)
  
  if(NOT RESULT)
!   message(SEND_ERROR "Could not build test project: ${OUTPUT}")
  endif(NOT RESULT)
  
--- 71,77 ----
  endif(HELP_XCODE)
  
+ message("Output from first build:\n${OUTPUT}")
  if(NOT RESULT)
!   message(SEND_ERROR "Could not build test project (1)!")
  endif(NOT RESULT)
  
***************
*** 131,134 ****
--- 139,143 ----
    ${BuildDepends_SOURCE_DIR}/Project
    testRebuild
+   CMAKE_FLAGS ${_cmake_options}
    OUTPUT_VARIABLE OUTPUT)
  
***************
*** 147,152 ****
  endif(HELP_XCODE)
  
  if(NOT RESULT)
!   message(SEND_ERROR "Could not build test project: ${OUTPUT}")
  endif(NOT RESULT)
  if(EXISTS 
--- 156,162 ----
  endif(HELP_XCODE)
  
+ message("Output from second build:\n${OUTPUT}")
  if(NOT RESULT)
!   message(SEND_ERROR "Could not build test project (2)!")
  endif(NOT RESULT)
  if(EXISTS