This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via d83c8d16b7b2cceadc9e031283ffae9244e48fa4 (commit)
via d7bc8dd6ea5fcecf613134764a040238cb115b4c (commit)
from 92aadd68345a3aa3df5a480465c4e28aca8d4a59 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d83c8d16b7b2cceadc9e031283ffae9244e48fa4
commit d83c8d16b7b2cceadc9e031283ffae9244e48fa4
Merge: 92aadd6 d7bc8dd
Author: Alexander Neundorf <neund...@kde.org>
AuthorDate: Wed Jun 27 17:41:46 2012 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jun 27 17:41:46 2012 -0400
Merge topic 'EclipseFixIncludeDirDetectionMinGW' into next
d7bc8dd Eclipse: fix #13313, always set LANG to C, also if unset
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7bc8dd6ea5fcecf613134764a040238cb115b4c
commit d7bc8dd6ea5fcecf613134764a040238cb115b4c
Author: Alex Neundorf <neund...@kde.org>
AuthorDate: Mon Jun 25 23:09:27 2012 +0200
Commit: Alex Neundorf <neund...@kde.org>
CommitDate: Mon Jun 25 23:09:27 2012 +0200
Eclipse: fix #13313, always set LANG to C, also if unset
Otherwise include dir detection does not work with MinGW on french systems.
Alex
diff --git
a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
index 1b4532d..455f95f 100644
--- a/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
+++ b/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
@@ -80,15 +80,10 @@ ENDMACRO(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang)
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()
-IF(_orig_lc_messages)
- SET(ENV{LC_MESSAGES} C)
-ENDIF()
-IF(_orig_lang)
- SET(ENV{LANG} C)
-ENDIF()
+
+SET(ENV{LC_ALL} C)
+SET(ENV{LC_MESSAGES} C)
+SET(ENV{LANG} C)
# Now check for C, works for gcc and Intel compiler at least
IF (NOT CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS)
@@ -109,12 +104,6 @@ IF (NOT CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS)
ENDIF ()
# Restore original LC_ALL, LC_MESSAGES, and LANG
-IF(_orig_lc_all)
- SET(ENV{LC_ALL} ${_orig_lc_all})
-ENDIF()
-IF(_orig_lc_messages)
- SET(ENV{LC_MESSAGES} ${_orig_lc_messages})
-ENDIF()
-IF(_orig_lang)
- SET(ENV{LANG} ${_orig_lang})
-ENDIF()
+SET(ENV{LC_ALL} ${_orig_lc_all})
+SET(ENV{LC_MESSAGES} ${_orig_lc_messages})
+SET(ENV{LANG} ${_orig_lang})
-----------------------------------------------------------------------
Summary of changes:
...atorDetermineCompilerMacrosAndIncludeDirs.cmake | 25 +++++--------------
1 files changed, 7 insertions(+), 18 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
