[Cmake-commits] CMake branch, next, updated. v2.8.11-2399-g258dedd

[Stephen Kelly]

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  258deddd8ca52507888b189d8324923de4aa8059 (commit)
       via  b0660ab1c483cd8b78661f0a8a3d6941f3153513 (commit)
      from  005bee38730724b52405da0957a92063acc0ea14 (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=258deddd8ca52507888b189d8324923de4aa8059
commit 258deddd8ca52507888b189d8324923de4aa8059
Merge: 005bee3 b0660ab
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 2 06:00:42 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 2 06:00:42 2013 -0400

    Merge topic 'VISIBILITY_PRESET-property' into next
    
    b0660ab Fix Intel compile definitions for hidden visibility.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0660ab1c483cd8b78661f0a8a3d6941f3153513
commit b0660ab1c483cd8b78661f0a8a3d6941f3153513
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 2 11:59:59 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jun 2 11:59:59 2013 +0200

    Fix Intel compile definitions for hidden visibility.

diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index 187f350..5b43db9 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -6,8 +6,8 @@ set(CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
 set(CMAKE_C_FLAGS_RELEASE_INIT "-O3 -DNDEBUG")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG")
 
-if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 12.0)
-  set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
+if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0)
+  set(CMAKE_C_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
 endif()
 
 set(CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index c7b40a4..35bb3ec 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -6,8 +6,8 @@ set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELEASE_INIT "-O3 -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG")
 
-if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 12.0)
-  set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
+if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0)
+  set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
 endif()
 
 set(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")

-----------------------------------------------------------------------

Summary of changes:
 Modules/Compiler/Intel-C.cmake   |    4 ++--
 Modules/Compiler/Intel-CXX.cmake |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake