[cmake-commits] alex committed DummyToolchain.cmake 1.2 1.3 ToolchainTest.cmake.in 1.5 1.6

[cmake-commits at cmake.org]

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

Modified Files:
	DummyToolchain.cmake ToolchainTest.cmake.in 
Log Message:

ENH: remove support for presetting CMAKE_SYSTEM_INFO_FILE,
CMAKE_SYSTEM_AND_C_COMPILER_INFO_FILE, CMAKE_SYSTEM_AND_CXX_COMPILER_INFO_FILE, 
CMAKE_SYSTEM_AND_C_COMPILER_AND_PROCESSOR_INFO_FILE and CMAKE_SYSTEM_AND_CXX_COMPILER_AND_PROCESSOR_INFO_FILE

Instead of presetting these variables to arbitrary filenames, users should
set up CMAKE_SYSTEM_NAME and the compilers correctly and also create a
Platform/ directory so these files will all follow the official cmake style,
which should make it easier to understand and debug project which have their
own platform/toolchain support files.

-remove support for a suffix to MS crosscompilers, since this is not (yet)
supported by cmake and might confuse users

Alex


Index: ToolchainTest.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeTests/ToolchainTest.cmake.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ToolchainTest.cmake.in	6 Jun 2007 17:43:46 -0000	1.5
+++ ToolchainTest.cmake.in	2 Jul 2007 17:29:36 -0000	1.6
@@ -121,10 +121,6 @@
 
 # check the results from DetermineCXXCompiler
 
-if(NOT "${_CMAKE_TOOLCHAIN_SUFFIX}" STREQUAL "arm")
-   message(FATAL_ERROR "wrong toolchain suffix detected: \"${_CMAKE_TOOLCHAIN_SUFFIX}\", expected: \"arm\"")
-endif(NOT "${_CMAKE_TOOLCHAIN_SUFFIX}" STREQUAL "arm")
-
 if(NOT "${_CMAKE_USER_CXX_COMPILER_PATH}" STREQUAL "/opt/bar/bin")
    message(FATAL_ERROR "wrong CXX compiler location detected: \"${_CMAKE_USER_CXX_COMPILER_PATH}\", expected: \"/opt/bar/bin\"")
 endif(NOT "${_CMAKE_USER_CXX_COMPILER_PATH}" STREQUAL "/opt/bar/bin")
@@ -134,7 +130,6 @@
 endif(NOT "${CMAKE_CXX_OUTPUT_EXTENSION}" STREQUAL ".bar")
 
 message(STATUS "CMAKE_SYSTEM: \"${CMAKE_SYSTEM}\"")
-message(STATUS "_CMAKE_TOOLCHAIN_SUFFIX: \"${_CMAKE_TOOLCHAIN_SUFFIX}\"")
 message(STATUS "_CMAKE_TOOLCHAIN_PREFIX: \"${_CMAKE_TOOLCHAIN_PREFIX}\"")
 message(STATUS "_CMAKE_USER_C_COMPILER_PATH: \"${_CMAKE_USER_C_COMPILER_PATH}\"")
 message(STATUS "_CMAKE_USER_CXX_COMPILER_PATH: \"${_CMAKE_USER_CXX_COMPILER_PATH}\"")

Index: DummyToolchain.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeTests/DummyToolchain.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DummyToolchain.cmake	17 May 2007 17:20:44 -0000	1.2
+++ DummyToolchain.cmake	2 Jul 2007 17:29:36 -0000	1.3
@@ -4,5 +4,5 @@
 set(CMAKE_C_COMPILER /opt/foo/bin/arm-elf-gcc)
 set(CMAKE_C_OUTPUT_EXTENSION ".foo")
 
-set(CMAKE_CXX_COMPILER /opt/bar/bin/clarm.exe)
+set(CMAKE_CXX_COMPILER /opt/bar/bin/cl.exe)
 set(CMAKE_CXX_OUTPUT_EXTENSION ".bar")