diff options
| author | Carlo Segato <brandon.ml@gmail.com> | 2009-08-09 22:22:33 +0000 |
|---|---|---|
| committer | Carlo Segato <brandon.ml@gmail.com> | 2009-08-09 22:22:33 +0000 |
| commit | 395de9a3cd4ca8691792d9de6c2f9ec397f6ebea (patch) | |
| tree | 20492b011ddb58b4059a0bf89c4f6b4f2e81cc88 | |
| parent | a618415d7c449aab3887dacf7833330602d49e37 (diff) | |
| download | extra-cmake-modules-395de9a3cd4ca8691792d9de6c2f9ec397f6ebea.tar.gz extra-cmake-modules-395de9a3cd4ca8691792d9de6c2f9ec397f6ebea.tar.bz2 | |
backport r1009407
don't use visibility on windows with gcc 4.4
svn path=/branches/KDE/4.3/kdelibs/; revision=1009408
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 6ba7c9f6..03f8f6d6 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -1079,7 +1079,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) string(REGEX MATCH "(--enable-libstdcxx-allocator=mt)" _GCC_COMPILED_WITH_BAD_ALLOCATOR "${_gcc_alloc_info}") endif (GCC_IS_NEWER_THAN_4_1) - if (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR) + if (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") set (KDE4_C_FLAGS "-fvisibility=hidden") # check that Qt defines Q_DECL_EXPORT as __attribute__ ((visibility("default"))) @@ -1101,9 +1101,9 @@ if (CMAKE_COMPILER_IS_GNUCXX) if (GCC_IS_NEWER_THAN_4_2) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") endif (GCC_IS_NEWER_THAN_4_2) - else (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR) + else (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) set (__KDE_HAVE_GCC_VISIBILITY 0) - endif (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR) + endif (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) endif (CMAKE_COMPILER_IS_GNUCXX) |