[Cmake-commits] [cmake-commits] king committed CMakeTestCCompiler.cmake 1.27.2.1 1.27.2.2 CMakeTestCXXCompiler.cmake 1.20.2.1 1.20.2.2 CMakeTestCompilerCommon.cmake NONE 1.1.2.2 CMakeTestFortranCompiler.cmake 1.11.2.1 1.11.2.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Feb 16 10:35:04 EST 2010
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv8403/Modules
Modified Files:
Tag: CMake-2-8
CMakeTestCCompiler.cmake CMakeTestCXXCompiler.cmake
CMakeTestFortranCompiler.cmake
Added Files:
Tag: CMake-2-8
CMakeTestCompilerCommon.cmake
Log Message:
CMake 2.8.1-rc3
Index: CMakeTestCCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeTestCCompiler.cmake,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -C 2 -d -r1.27.2.1 -r1.27.2.2
*** CMakeTestCCompiler.cmake 1 Oct 2009 21:20:21 -0000 1.27.2.1
--- CMakeTestCCompiler.cmake 16 Feb 2010 15:35:02 -0000 1.27.2.2
***************
*** 13,16 ****
--- 13,18 ----
# License text for the above reference.)
+ INCLUDE(CMakeTestCompilerCommon)
+
# This file is used by EnableLanguage in cmGlobalGenerator to
# determine that that selected C compiler can actually compile
***************
*** 19,23 ****
# any makefiles or projects.
IF(NOT CMAKE_C_COMPILER_WORKS)
! MESSAGE(STATUS "Check for working C compiler: ${CMAKE_C_COMPILER}")
FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCCompiler.c
"#ifdef __cplusplus\n"
--- 21,25 ----
# any makefiles or projects.
IF(NOT CMAKE_C_COMPILER_WORKS)
! PrintTestCompilerStatus("C" "")
FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCCompiler.c
"#ifdef __cplusplus\n"
***************
*** 39,43 ****
IF(NOT CMAKE_C_COMPILER_WORKS)
! MESSAGE(STATUS "Check for working C compiler: ${CMAKE_C_COMPILER} -- broken")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"Determining if the C compiler works failed with "
--- 41,45 ----
IF(NOT CMAKE_C_COMPILER_WORKS)
! PrintTestCompilerStatus("C" " -- broken")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"Determining if the C compiler works failed with "
***************
*** 54,58 ****
ELSE(NOT CMAKE_C_COMPILER_WORKS)
IF(C_TEST_WAS_RUN)
! MESSAGE(STATUS "Check for working C compiler: ${CMAKE_C_COMPILER} -- works")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
"Determining if the C compiler works passed with "
--- 56,60 ----
ELSE(NOT CMAKE_C_COMPILER_WORKS)
IF(C_TEST_WAS_RUN)
! PrintTestCompilerStatus("C" " -- works")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
"Determining if the C compiler works passed with "
Index: CMakeTestCXXCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeTestCXXCompiler.cmake,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -C 2 -d -r1.20.2.1 -r1.20.2.2
*** CMakeTestCXXCompiler.cmake 1 Oct 2009 21:20:21 -0000 1.20.2.1
--- CMakeTestCXXCompiler.cmake 16 Feb 2010 15:35:02 -0000 1.20.2.2
***************
*** 13,16 ****
--- 13,18 ----
# License text for the above reference.)
+ INCLUDE(CMakeTestCompilerCommon)
+
# This file is used by EnableLanguage in cmGlobalGenerator to
# determine that that selected C++ compiler can actually compile
***************
*** 19,23 ****
# any makefiles or projects.
IF(NOT CMAKE_CXX_COMPILER_WORKS)
! MESSAGE(STATUS "Check for working CXX compiler: ${CMAKE_CXX_COMPILER}")
FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCXXCompiler.cxx
"#ifndef __cplusplus\n"
--- 21,25 ----
# any makefiles or projects.
IF(NOT CMAKE_CXX_COMPILER_WORKS)
! PrintTestCompilerStatus("CXX" "")
FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testCXXCompiler.cxx
"#ifndef __cplusplus\n"
***************
*** 32,36 ****
IF(NOT CMAKE_CXX_COMPILER_WORKS)
! MESSAGE(STATUS "Check for working CXX compiler: ${CMAKE_CXX_COMPILER} -- broken")
# if the compiler is broken make sure to remove the platform file
# since Windows-cl configures both c/cxx files both need to be removed
--- 34,38 ----
IF(NOT CMAKE_CXX_COMPILER_WORKS)
! PrintTestCompilerStatus("CXX" " -- broken")
# if the compiler is broken make sure to remove the platform file
# since Windows-cl configures both c/cxx files both need to be removed
***************
*** 47,51 ****
ELSE(NOT CMAKE_CXX_COMPILER_WORKS)
IF(CXX_TEST_WAS_RUN)
! MESSAGE(STATUS "Check for working CXX compiler: ${CMAKE_CXX_COMPILER} -- works")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
"Determining if the CXX compiler works passed with "
--- 49,53 ----
ELSE(NOT CMAKE_CXX_COMPILER_WORKS)
IF(CXX_TEST_WAS_RUN)
! PrintTestCompilerStatus("CXX" " -- works")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
"Determining if the CXX compiler works passed with "
Index: CMakeTestFortranCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeTestFortranCompiler.cmake,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C 2 -d -r1.11.2.1 -r1.11.2.2
*** CMakeTestFortranCompiler.cmake 1 Oct 2009 21:20:21 -0000 1.11.2.1
--- CMakeTestFortranCompiler.cmake 16 Feb 2010 15:35:02 -0000 1.11.2.2
***************
*** 13,16 ****
--- 13,18 ----
# License text for the above reference.)
+ INCLUDE(CMakeTestCompilerCommon)
+
# This file is used by EnableLanguage in cmGlobalGenerator to
# determine that that selected Fortran compiler can actually compile
***************
*** 19,23 ****
# any makefiles or projects.
IF(NOT CMAKE_Fortran_COMPILER_WORKS)
! MESSAGE(STATUS "Check for working Fortran compiler: ${CMAKE_Fortran_COMPILER}")
FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler.f "
PROGRAM TESTFortran
--- 21,25 ----
# any makefiles or projects.
IF(NOT CMAKE_Fortran_COMPILER_WORKS)
! PrintTestCompilerStatus("Fortran" "")
FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testFortranCompiler.f "
PROGRAM TESTFortran
***************
*** 32,36 ****
IF(NOT CMAKE_Fortran_COMPILER_WORKS)
! MESSAGE(STATUS "Check for working Fortran compiler: ${CMAKE_Fortran_COMPILER} -- broken")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"Determining if the Fortran compiler works failed with "
--- 34,38 ----
IF(NOT CMAKE_Fortran_COMPILER_WORKS)
! PrintTestCompilerStatus("Fortran" " -- broken")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"Determining if the Fortran compiler works failed with "
***************
*** 42,46 ****
ELSE(NOT CMAKE_Fortran_COMPILER_WORKS)
IF(FORTRAN_TEST_WAS_RUN)
! MESSAGE(STATUS "Check for working Fortran compiler: ${CMAKE_Fortran_COMPILER} -- works")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
"Determining if the Fortran compiler works passed with "
--- 44,48 ----
ELSE(NOT CMAKE_Fortran_COMPILER_WORKS)
IF(FORTRAN_TEST_WAS_RUN)
! PrintTestCompilerStatus("Fortran" " -- works")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
"Determining if the Fortran compiler works passed with "
--- NEW FILE: CMakeTestCompilerCommon.cmake ---
#=============================================================================
# Copyright 2010 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
function(PrintTestCompilerStatus LANG MSG)
IF(CMAKE_GENERATOR MATCHES Make)
MESSAGE(STATUS "Check for working ${LANG} compiler: ${CMAKE_${LANG}_COMPILER}${MSG}")
ELSE()
MESSAGE(STATUS "Check for working ${LANG} compiler using: ${CMAKE_GENERATOR}${MSG}")
ENDIF()
endfunction()
More information about the Cmake-commits
mailing list