[Cmake-commits] [cmake-commits] alex committed CMakeFindEclipseCDT4.cmake 1.1 1.2

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeFindEclipseCDT4.cmake 
Log Message:
BUG: recognize system include paths also when the languages are set to
something different from "C", by resetting them to "C" (#9122)

Alex


Index: CMakeFindEclipseCDT4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFindEclipseCDT4.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** CMakeFindEclipseCDT4.cmake	12 May 2009 19:11:16 -0000	1.1
--- CMakeFindEclipseCDT4.cmake	28 Jun 2009 09:59:42 -0000	1.2
***************
*** 26,29 ****
--- 26,44 ----
  ENDMACRO(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang)
  
+ # Save the current LC_ALL, LC_MESSAGES, and LANG environment variables and set them
+ # to "C" that way GCC's "search starts here" text is in English and we can grok it.
+ SET(_orig_lc_all      $ENV{LC_ALL})
+ SET(_orig_lc_messages $ENV{LC_MESSAGES})
+ SET(_orig_lang        $ENV{LANG})
+ IF(_orig_lc_all)
+   SET(ENV{LC_ALL}      C)
+ ENDIF(_orig_lc_all)
+ IF(_orig_lc_messages)
+   SET(ENV{LC_MESSAGES} C)
+ ENDIF(_orig_lc_messages)
+ IF(_orig_lang)
+   SET(ENV{LANG}        C)
+ ENDIF(_orig_lang)
+ 
  # Now check for C
  IF ("${CMAKE_C_COMPILER_ID}" MATCHES GNU  AND NOT  CMAKE_ECLIPSE_C_SYSTEM_INCLUDE_DIRS)
***************
*** 38,39 ****
--- 53,64 ----
  ENDIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES GNU  AND NOT  CMAKE_ECLIPSE_CXX_SYSTEM_INCLUDE_DIRS)
  
+ # Restore original LC_ALL, LC_MESSAGES, and LANG
+ IF(_orig_lc_all)
+   SET(ENV{LC_ALL}      ${_orig_lc_all})
+ ENDIF(_orig_lc_all)
+ IF(_orig_lc_messages)
+   SET(ENV{LC_MESSAGES} ${_orig_lc_messages})
+ ENDIF(_orig_lc_messages)
+ IF(_orig_lang)
+   SET(ENV{LANG}        ${_orig_lang})
+ ENDIF(_orig_lang)