[Cmake-commits] [cmake-commits] hoffman committed CMakeCInformation.cmake 1.22 1.23

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Oct 1 13:24:53 EDT 2008


Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv14798

Modified Files:
	CMakeCInformation.cmake 
Log Message:
BUG: fix for bug 4772, enable_language should now work on linux with correct flags


Index: CMakeCInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCInformation.cmake,v
retrieving revision 1.22
retrieving revision 1.23
diff -C 2 -d -r1.22 -r1.23
*** CMakeCInformation.cmake	4 Aug 2008 15:37:19 -0000	1.22
--- CMakeCInformation.cmake	1 Oct 2008 17:24:50 -0000	1.23
***************
*** 33,40 ****
  # load the system- and compiler specific files
  IF(CMAKE_C_COMPILER_ID)
!   INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_ID}-C OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
  ENDIF(CMAKE_C_COMPILER_ID)
  IF (NOT _INCLUDED_FILE)
!   INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
  ENDIF (NOT _INCLUDED_FILE)
  
--- 33,50 ----
  # load the system- and compiler specific files
  IF(CMAKE_C_COMPILER_ID)
!   INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_C_COMPILER_ID}-C
!     OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
  ENDIF(CMAKE_C_COMPILER_ID)
  IF (NOT _INCLUDED_FILE)
!   INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} 
!     OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
! ENDIF (NOT _INCLUDED_FILE)
! # some systems include the compiler information in the system file
! # and if this is the enable_language command then it may not have been
! # included at this point, or needs to be included again so that the
! # language_INIT variables are set correctly
! IF (NOT _INCLUDED_FILE)
!   INCLUDE(Platform/${CMAKE_SYSTEM_NAME} 
!     OPTIONAL RESULT_VARIABLE _INCLUDED_FILE)
  ENDIF (NOT _INCLUDED_FILE)
  



More information about the Cmake-commits mailing list