aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Neundorf <neundorf@kde.org>2013-02-18 19:35:26 +0100
committerAlex Neundorf <neundorf@kde.org>2013-02-18 19:35:26 +0100
commitb3723a0bfefae301282eabd21e3c90f0316cb2a0 (patch)
tree2f71828419a77e471efad7efcf1fa90f0184ccc2
parent92ee4002ac7f2015797140fcf5944f219074972d (diff)
downloadextra-cmake-modules-b3723a0bfefae301282eabd21e3c90f0316cb2a0.tar.gz
extra-cmake-modules-b3723a0bfefae301282eabd21e3c90f0316cb2a0.tar.bz2
remove -Wl,--disable-auto-import from mingw options
Same as 21c3f0bed3b758baefb9b760efb0c2dd by Patrick von Reth in kdelibs. He says: "dont disable auto-import, to make it possible to build with a newer mingw which doesnt have proper exports for c++ standart libs The problem occurs with all gcc versions newer then 4.4. In preparation for Qt5 I started to work with newer builds, currently 4.7.2. The change should not have any negative effects on 4.4 and earlier versions, but is essential to make it build with a newer version." Alex
-rw-r--r--kde-modules/KDECompilerSettings.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake
index dde44674..b628e40f 100644
--- a/kde-modules/KDECompilerSettings.cmake
+++ b/kde-modules/KDECompilerSettings.cmake
@@ -315,8 +315,8 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
# gcc under Windows
if (MINGW)
- set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--export-all-symbols -Wl,--disable-auto-import")
- set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--export-all-symbols -Wl,--disable-auto-import")
+ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--export-all-symbols")
+ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--export-all-symbols")
endif ()
# TODO : with CMake 2.8.11 this can be removed, it will work automatically