[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.18.2.1 1.18.2.2

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Jan 28 16:48:21 EST 2010


Update of /cvsroot/CMake/CMake/Tests/TryCompile
In directory public:/mounts/ram/cvs-serv23913/Tests/TryCompile

Modified Files:
      Tag: CMake-2-8
	CMakeLists.txt 
Log Message:
CMake 2.8.1-rc1


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/TryCompile/CMakeLists.txt,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -C 2 -d -r1.18.2.1 -r1.18.2.2
*** CMakeLists.txt	3 Nov 2009 22:25:20 -0000	1.18.2.1
--- CMakeLists.txt	28 Jan 2010 21:48:19 -0000	1.18.2.2
***************
*** 212,222 ****
  TEST_ASSERT(CXX_RUN_SHOULD_WORK "CHECK_CXX_SOURCE_RUNS() failed")
  
  UNSET(C_BOGUS_FLAG CACHE)
  INCLUDE(CheckCCompilerFlag)
! CHECK_C_COMPILER_FLAG(---_this_is_not_a_flag_ C_BOGUS_FLAG)
  TEST_FAIL(C_BOGUS_FLAG "CHECK_C_COMPILER_FLAG() succeeded, but should have failed")
  
  UNSET(CXX_BOGUS_FLAG CACHE)
  INCLUDE(CheckCXXCompilerFlag)
! CHECK_CXX_COMPILER_FLAG(---_this_is_not_a_flag_ CXX_BOGUS_FLAG)
  TEST_FAIL(CXX_BOGUS_FLAG "CHECK_CXX_COMPILER_FLAG() succeeded, but should have failed")
--- 212,228 ----
  TEST_ASSERT(CXX_RUN_SHOULD_WORK "CHECK_CXX_SOURCE_RUNS() failed")
  
+ FOREACH(lang C CXX)
+   IF(NOT "${CMAKE_${lang}_COMPILER_ID}" MATCHES "^(PathScale)$")
+     SET(${lang}_DD --)
+   ENDIF()
+ ENDFOREACH()
+ 
  UNSET(C_BOGUS_FLAG CACHE)
  INCLUDE(CheckCCompilerFlag)
! CHECK_C_COMPILER_FLAG(${C_DD}-_this_is_not_a_flag_ C_BOGUS_FLAG)
  TEST_FAIL(C_BOGUS_FLAG "CHECK_C_COMPILER_FLAG() succeeded, but should have failed")
  
  UNSET(CXX_BOGUS_FLAG CACHE)
  INCLUDE(CheckCXXCompilerFlag)
! CHECK_CXX_COMPILER_FLAG(${CXX_DD}-_this_is_not_a_flag_ CXX_BOGUS_FLAG)
  TEST_FAIL(CXX_BOGUS_FLAG "CHECK_CXX_COMPILER_FLAG() succeeded, but should have failed")



More information about the Cmake-commits mailing list