[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7516-g9401f64

[Nils Gladitz]

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  9401f64c3fa06d3c0eab7dee61ef989c441c6a33 (commit)
       via  b7f58511cf050b8976445694446c695c9d230b8b (commit)
      from  1ef49162117af4f0e40c0445994ae1c72b75daa7 (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=9401f64c3fa06d3c0eab7dee61ef989c441c6a33
commit 9401f64c3fa06d3c0eab7dee61ef989c441c6a33
Merge: 1ef4916 b7f5851
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Feb 7 10:51:31 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 7 10:51:31 2014 -0500

    Merge topic 'intel-visibility' into next
    
    b7f58511 Visibility: the Intel compiler does not support -fvisibility on windows


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7f58511cf050b8976445694446c695c9d230b8b
commit b7f58511cf050b8976445694446c695c9d230b8b
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Feb 7 11:50:08 2014 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Feb 7 11:50:08 2014 +0100

    Visibility: the Intel compiler does not support -fvisibility on windows

diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index 7d98f03..1d651e3 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -8,9 +8,5 @@ set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG")
 
 set(CMAKE_DEPFILE_FLAGS_C "-MMD -MT <OBJECT> -MF <DEPFILE>")
 
-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>")
 set(CMAKE_C_CREATE_ASSEMBLY_SOURCE "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index 36a838d..020e862 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -8,9 +8,5 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG")
 
 set(CMAKE_DEPFILE_FLAGS_CXX "-MMD -MT <OBJECT> -MF <DEPFILE>")
 
-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>")
 set(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
diff --git a/Modules/Platform/Darwin-icc.cmake b/Modules/Platform/Darwin-icc.cmake
index 0fab9a1..c7e31c0 100644
--- a/Modules/Platform/Darwin-icc.cmake
+++ b/Modules/Platform/Darwin-icc.cmake
@@ -75,6 +75,12 @@ if(XCODE)
   set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX)
 endif()
 
+if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0)
+  set(CMAKE_C_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
+  set(CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
+endif()
+
+
 set(CMAKE_MacOSX_Content_COMPILE_OBJECT "\"${CMAKE_COMMAND}\" -E copy_if_different <SOURCE> <OBJECT>")
 
 set(CMAKE_C_CREATE_SHARED_LIBRARY
diff --git a/Modules/Platform/Linux-Intel.cmake b/Modules/Platform/Linux-Intel.cmake
index 2394f10..20fddb4 100644
--- a/Modules/Platform/Linux-Intel.cmake
+++ b/Modules/Platform/Linux-Intel.cmake
@@ -47,4 +47,8 @@ macro(__linux_compiler_intel lang)
       "${XIAR} cr <TARGET> <LINK_FLAGS> <OBJECTS> "
       "${XIAR} -s <TARGET> ")
   endif()
+
+  if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 12.0)
+    set(CMAKE_${lang}_COMPILE_OPTIONS_VISIBILITY "-fvisibility=")
+  endif()
 endmacro()

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

Summary of changes:
 Modules/Compiler/Intel-C.cmake     |    4 ----
 Modules/Compiler/Intel-CXX.cmake   |    4 ----
 Modules/Platform/Darwin-icc.cmake  |    6 ++++++
 Modules/Platform/Linux-Intel.cmake |    4 ++++
 4 files changed, 10 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake