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

[cmake-commits at cmake.org]

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

Modified Files:
	Windows-cl.cmake 
Log Message:
ENH: better error message for mis-configured nmake environment


Index: Windows-cl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-cl.cmake,v
retrieving revision 1.88
retrieving revision 1.89
diff -C 2 -d -r1.88 -r1.89
*** Windows-cl.cmake	24 Jun 2008 20:47:31 -0000	1.88
--- Windows-cl.cmake	14 Oct 2008 15:42:45 -0000	1.89
***************
*** 30,34 ****
  
  # make sure to enable languages after setting configuration types
! ENABLE_LANGUAGE(RC)
  SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>")
  
--- 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>")