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 1197c43f2792bc89d82927abf0ab91a88b0974f2 (commit) via 1590d5fe4f95a800635ba9078e822d742a96dc18 (commit) via 750b67c5a1957f5fa2c7a483050f0ef0959c9924 (commit) from 0a200566d20321ba642f3347e85affb27cc559ce (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=1197c43f2792bc89d82927abf0ab91a88b0974f2 commit 1197c43f2792bc89d82927abf0ab91a88b0974f2 Merge: 0a20056 1590d5f Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Thu Aug 11 04:56:45 2011 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Aug 11 04:56:45 2011 -0400 Merge topic 'generate_export_header' into next 1590d5f Don't export methods on already exported classes. 750b67c Don't use hidden visibility on non-mingw windows either. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1590d5fe4f95a800635ba9078e822d742a96dc18 commit 1590d5fe4f95a800635ba9078e822d742a96dc18 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Thu Aug 11 10:54:21 2011 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Thu Aug 11 10:55:12 2011 +0200 Don't export methods on already exported classes. This is always a mistake. diff --git a/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h b/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h index 400d664..049bfe9 100644 --- a/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h +++ b/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h @@ -8,11 +8,7 @@ class LIBSHARED_AND_STATIC_EXPORT LibsharedAndStatic { public: int libshared_and_static() const; -#ifdef COMPILER_IS_MSVC int libshared_and_static_exported() const; -#else - int LIBSHARED_AND_STATIC_EXPORT libshared_and_static_exported() const; -#endif int LIBSHARED_AND_STATIC_DEPRECATED libshared_and_static_deprecated() const; diff --git a/Tests/Module/GenerateExportHeader/libshared/libshared.h b/Tests/Module/GenerateExportHeader/libshared/libshared.h index 280e185..3d9bbff 100644 --- a/Tests/Module/GenerateExportHeader/libshared/libshared.h +++ b/Tests/Module/GenerateExportHeader/libshared/libshared.h @@ -8,12 +8,7 @@ class LIBSHARED_EXPORT Libshared { public: int libshared() const; -#ifdef COMPILER_IS_MSVC - // Double exporting not possible with MSVC int libshared_exported() const; -#else - int LIBSHARED_EXPORT libshared_exported() const; -#endif int LIBSHARED_DEPRECATED libshared_deprecated() const; diff --git a/Tests/Module/GenerateExportHeader/libstatic/libstatic.h b/Tests/Module/GenerateExportHeader/libstatic/libstatic.h index cd68cdc..cc7a35b 100644 --- a/Tests/Module/GenerateExportHeader/libstatic/libstatic.h +++ b/Tests/Module/GenerateExportHeader/libstatic/libstatic.h @@ -8,7 +8,7 @@ class LIBSTATIC_EXPORT Libstatic { public: int libstatic() const; - int LIBSTATIC_EXPORT libstatic_exported() const; + int libstatic_exported() const; int LIBSTATIC_DEPRECATED libstatic_deprecated() const; http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=750b67c5a1957f5fa2c7a483050f0ef0959c9924 commit 750b67c5a1957f5fa2c7a483050f0ef0959c9924 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Thu Aug 11 10:53:58 2011 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Thu Aug 11 10:53:58 2011 +0200 Don't use hidden visibility on non-mingw windows either. diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index 322439b..92b9433 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -132,7 +132,7 @@ macro(_test_compiler_hidden_visibility) endif() endif() - if (NOT GCC_TOO_OLD AND NOT MINGW) + if (NOT GCC_TOO_OLD AND NOT WIN32) check_cxx_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY) check_cxx_compiler_flag(-fvisibility-inlines-hidden COMPILER_HAS_HIDDEN_INLINE_VISIBILITY) option(USE_COMPILER_HIDDEN_VISIBILITY "Use HIDDEN visibility support if available." ON) ----------------------------------------------------------------------- Summary of changes: Modules/GenerateExportHeader.cmake | 2 +- .../lib_shared_and_static/libshared_and_static.h | 4 ---- .../GenerateExportHeader/libshared/libshared.h | 5 ----- .../GenerateExportHeader/libstatic/libstatic.h | 2 +- 4 files changed, 2 insertions(+), 11 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits