[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.13 1.14

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
Avoid Intel linker crash in BuildDepends test

The BuildDepends test exercises incremental linking with MSVC and Intel
tools on Windows.  In some cases the Intel compiler creates objects that
cause the MS linker it invokes to crash during incremental linking.  We
avoid the problem for this test by disabling incremental linking.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/BuildDepends/CMakeLists.txt,v
retrieving revision 1.13
retrieving revision 1.14
diff -C 2 -d -r1.13 -r1.14
*** CMakeLists.txt	22 Oct 2009 13:35:58 -0000	1.13
--- CMakeLists.txt	27 Oct 2009 15:31:40 -0000	1.14
***************
*** 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)
***************
*** 132,135 ****
--- 139,143 ----
    ${BuildDepends_SOURCE_DIR}/Project
    testRebuild
+   CMAKE_FLAGS ${_cmake_options}
    OUTPUT_VARIABLE OUTPUT)