[Cmake-commits] [cmake-commits] hoffman committed Windows-cl.cmake 1.89 1.90

[cmake-commits at cmake.org]

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

Modified Files:
	Windows-cl.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: Windows-cl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-cl.cmake,v
retrieving revision 1.89
retrieving revision 1.90
diff -C 2 -d -r1.89 -r1.90
*** Windows-cl.cmake	14 Oct 2008 15:42:45 -0000	1.89
--- Windows-cl.cmake	14 Oct 2008 20:07:11 -0000	1.90
***************
*** 30,37 ****
  
  # make sure to enable languages after setting configuration types
! IF(NOT ENABLE_LANGUAGE_RC_CALLED AND NOT CMAKE_DO_TRY_COMPILE)
!   ENABLE_LANGUAGE(RC)
! ENDIF(NOT ENABLE_LANGUAGE_RC_CALLED AND NOT CMAKE_DO_TRY_COMPILE)
! SET(ENABLE_LANGUAGE_RC_CALLED TRUE)
  SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
  
--- 30,34 ----
  
  # make sure to enable languages after setting configuration types
! ENABLE_LANGUAGE(RC)
  SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")