[Cmake-commits] [cmake-commits] hoffman committed CMakeASMInformation.cmake 1.3 1.4 CMakeCInformation.cmake 1.23 1.24 CMakeCXXInformation.cmake 1.26 1.27 CMakeDetermineRCCompiler.cmake 1.8 1.9 CMakeFortranInformation.cmake 1.21 1.22 CMakeRCInformation.cmake 1.7 1.8

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeASMInformation.cmake CMakeCInformation.cmake 
	CMakeCXXInformation.cmake CMakeDetermineRCCompiler.cmake 
	CMakeFortranInformation.cmake CMakeRCInformation.cmake 
Log Message:
ENH: fix problem where rc language recursively included itself because CMAKE_BASE_NAME was used from c compiler, do the same fix for other uses of CMAKE_BASE_NAME


Index: CMakeCInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCInformation.cmake,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -d -r1.23 -r1.24
*** CMakeCInformation.cmake	1 Oct 2008 17:24:50 -0000	1.23
--- CMakeCInformation.cmake	14 Oct 2008 20:07:11 -0000	1.24
***************
*** 13,17 ****
    SET(CMAKE_C_OUTPUT_EXTENSION .obj)
  ENDIF(UNIX)
! 
  GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_C_COMPILER} NAME_WE)
  IF(CMAKE_COMPILER_IS_GNUCC)
--- 13,17 ----
    SET(CMAKE_C_OUTPUT_EXTENSION .obj)
  ENDIF(UNIX)
! SET(CMAKE_BASE_NAME)
  GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_C_COMPILER} NAME_WE)
  IF(CMAKE_COMPILER_IS_GNUCC)

Index: CMakeASMInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeASMInformation.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** CMakeASMInformation.cmake	4 Mar 2008 01:24:18 -0000	1.3
--- CMakeASMInformation.cmake	14 Oct 2008 20:07:11 -0000	1.4
***************
*** 8,12 ****
  
  SET(CMAKE_INCLUDE_FLAG_ASM${ASM_DIALECT} "-I")       # -I
! 
  GET_FILENAME_COMPONENT(CMAKE_BASE_NAME "${CMAKE_ASM${ASM_DIALECT}_COMPILER}" NAME_WE)
  
--- 8,12 ----
  
  SET(CMAKE_INCLUDE_FLAG_ASM${ASM_DIALECT} "-I")       # -I
! SET(CMAKE_BASE_NAME)
  GET_FILENAME_COMPONENT(CMAKE_BASE_NAME "${CMAKE_ASM${ASM_DIALECT}_COMPILER}" NAME_WE)
  

Index: CMakeFortranInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranInformation.cmake,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** CMakeFortranInformation.cmake	4 Aug 2008 15:37:19 -0000	1.21
--- CMakeFortranInformation.cmake	14 Oct 2008 20:07:11 -0000	1.22
***************
*** 4,7 ****
--- 4,8 ----
  # if it exists.
  
+ SET(CMAKE_BASE_NAME)
  GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_Fortran_COMPILER} NAME_WE)
  # since the gnu compiler has several names force g++

Index: CMakeDetermineRCCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineRCCompiler.cmake,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** CMakeDetermineRCCompiler.cmake	31 Aug 2006 14:46:02 -0000	1.8
--- CMakeDetermineRCCompiler.cmake	14 Oct 2008 20:07:11 -0000	1.9
***************
*** 47,48 ****
--- 47,49 ----
                 ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeRCCompiler.cmake IMMEDIATE)
  SET(CMAKE_RC_COMPILER_ENV_VAR "RC")
+ SET(ENABLE_LANGUAGE_RC_CALLED TRUE)

Index: CMakeCXXInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXInformation.cmake,v
retrieving revision 1.26
retrieving revision 1.27
diff -C 2 -d -r1.26 -r1.27
*** CMakeCXXInformation.cmake	4 Aug 2008 15:37:19 -0000	1.26
--- CMakeCXXInformation.cmake	14 Oct 2008 20:07:11 -0000	1.27
***************
*** 14,18 ****
  ENDIF(UNIX)
  
! 
  GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_CXX_COMPILER} NAME_WE)
  # since the gnu compiler has several names force g++
--- 14,18 ----
  ENDIF(UNIX)
  
! SET(CMAKE_BASE_NAME)
  GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_CXX_COMPILER} NAME_WE)
  # since the gnu compiler has several names force g++

Index: CMakeRCInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeRCInformation.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** CMakeRCInformation.cmake	9 Oct 2008 17:52:30 -0000	1.7
--- CMakeRCInformation.cmake	14 Oct 2008 20:07:11 -0000	1.8
***************
*** 4,7 ****
--- 4,9 ----
  # if it exists.
  
+ # make sure we don't use CMAKE_BASE_NAME from somewhere else
+ SET(CMAKE_BASE_NAME)
  GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_RC_COMPILER} NAME_WE)
  SET(CMAKE_SYSTEM_AND_RC_COMPILER_INFO_FILE
***************
*** 10,13 ****
--- 12,16 ----
  
  
+ 
  SET (CMAKE_RC_FLAGS "$ENV{RCFLAGS} ${CMAKE_RC_FLAGS_INIT}" CACHE STRING
       "Flags for Fortran compiler.")