[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.17.2.6 1.17.2.7 CompilerIdVendorTest.cmake.in 1.1.2.2 1.1.2.3

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/CMakeTests
In directory public:/mounts/ram/cvs-serv14303/Tests/CMakeTests

Modified Files:
      Tag: CMake-2-8
	CMakeLists.txt 
Added Files:
      Tag: CMake-2-8
	CompilerIdVendorTest.cmake.in 
Log Message:
CMake 2.8.1-rc2


--- NEW FILE: CompilerIdVendorTest.cmake.in ---
# This is not supposed to be included by user code, but we need to
# test it.
include(${CMAKE_ROOT}/Modules/CMakeDetermineCompilerId.cmake)

set(MY_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@/CompilerIdVendor")
file(REMOVE_RECURSE ${MY_BINARY_DIR})
file(MAKE_DIRECTORY ${MY_BINARY_DIR})

set(CMAKE_MyLang_COMPILER ${CMAKE_COMMAND})
set(CMAKE_MyLang_COMPILER_ID_ARG1)
set(CMAKE_MyLang_COMPILER_ID_FLAGS_LIST)
set(CMAKE_MyLang_COMPILER_ID_DIR ${MY_BINARY_DIR})

file(WRITE "${MY_BINARY_DIR}/BogusVendor.cmake" "message(\"This is a BogusVendor compiler\")")
list(APPEND CMAKE_MyLang_COMPILER_ID_VENDORS BogusVendor)
set(CMAKE_MyLang_COMPILER_ID_VENDOR_FLAGS_BogusVendor -P BogusVendor.cmake)
set(CMAKE_MyLang_COMPILER_ID_VENDOR_REGEX_BogusVendor ThisDoesNotMatch_BogusVendor)

file(WRITE "${MY_BINARY_DIR}/MyVendor.cmake" "message(\"This is a MyVendor compiler\")")
list(APPEND CMAKE_MyLang_COMPILER_ID_VENDORS MyVendor)
set(CMAKE_MyLang_COMPILER_ID_VENDOR_FLAGS_MyVendor -P MyVendor.cmake)
set(CMAKE_MyLang_COMPILER_ID_VENDOR_REGEX_MyVendor MyVendor)

set(CMAKE_BINARY_DIR ${MY_BINARY_DIR})
cmake_determine_compiler_id_vendor(MyLang)

if("${CMAKE_MyLang_COMPILER_ID}" STREQUAL "MyVendor")
  message(STATUS "Found MyVendor compiler id!")
else()
  message(FATAL_ERROR "Did not find MyVendor compiler id: [${CMAKE_MyLang_COMPILER_ID}]")
endif()

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeTests/CMakeLists.txt,v
retrieving revision 1.17.2.6
retrieving revision 1.17.2.7
diff -C 2 -d -r1.17.2.6 -r1.17.2.7
*** CMakeLists.txt	1 Feb 2010 14:22:35 -0000	1.17.2.6
--- CMakeLists.txt	11 Feb 2010 15:50:42 -0000	1.17.2.7
***************
*** 27,30 ****
--- 27,31 ----
  AddCMakeTest(Math "")
  AddCMakeTest(CMakeMinimumRequired "")
+ AddCMakeTest(CompilerIdVendor "")
  
  if(HAVE_ELF_H)
***************
*** 47,55 ****
  #
  if(do_cvs_tests)
    set(CheckSourceTree_PreArgs
      "-DCMake_BINARY_DIR:PATH=${CMake_BINARY_DIR}"
      "-DCMake_SOURCE_DIR:PATH=${CMake_SOURCE_DIR}"
      "-DCVS_EXECUTABLE:STRING=${CVS_EXECUTABLE}"
!     "-DHOME:STRING=$ENV{HOME}"
      )
    AddCMakeTest(CheckSourceTree "${CheckSourceTree_PreArgs}")
--- 48,57 ----
  #
  if(do_cvs_tests)
+   string(REPLACE "\\" "/" ENV_HOME "$ENV{HOME}")
    set(CheckSourceTree_PreArgs
      "-DCMake_BINARY_DIR:PATH=${CMake_BINARY_DIR}"
      "-DCMake_SOURCE_DIR:PATH=${CMake_SOURCE_DIR}"
      "-DCVS_EXECUTABLE:STRING=${CVS_EXECUTABLE}"
!     "-DHOME:STRING=${ENV_HOME}"
      )
    AddCMakeTest(CheckSourceTree "${CheckSourceTree_PreArgs}")