diff options
| author | David Faure <faure@kde.org> | 2006-05-15 23:12:31 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2006-05-15 23:12:31 +0000 |
| commit | a05810fcda22bbf60e671398da40159cb670601c (patch) | |
| tree | 05f4ba97609aef296123d0494a8a8ebd52cf12d3 /modules | |
| parent | 7084c97f730e23b18e38ffe0b1ac59246743c4f2 (diff) | |
| download | extra-cmake-modules-a05810fcda22bbf60e671398da40159cb670601c.tar.gz extra-cmake-modules-a05810fcda22bbf60e671398da40159cb670601c.tar.bz2 | |
-avoid-version was a libtool option, don't pass it to the linker
svn path=/trunk/KDE/kdelibs/; revision=541334
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 4a22d1c2..d4b31feb 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -549,13 +549,13 @@ endif (APPLE) if (CMAKE_SYSTEM_NAME MATCHES Linux) if (CMAKE_COMPILER_IS_GNUCXX) set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE) - set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc") - set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc") + set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc") + set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings-Wl,--no-undefined -lc") endif (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_C_COMPILER MATCHES "icc") set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE) -# set ( CMAKE_SHARED_LINKER_FLAGS "-Qoption,ld,--fatal-warnings -avoid-version --no-undefined -lc") -# set ( CMAKE_MODULE_LINKER_FLAGS "-Qoption,ld,--fatal-warnings -avoid-version --no-undefined -lc") +# set ( CMAKE_SHARED_LINKER_FLAGS "-Qoption,ld,--fatal-warnings --no-undefined -lc") +# set ( CMAKE_MODULE_LINKER_FLAGS "-Qoption,ld,--fatal-warnings --no-undefined -lc") set ( CMAKE_SHARED_LINKER_FLAGS "") set ( CMAKE_MODULE_LINKER_FLAGS "") endif (CMAKE_C_COMPILER MATCHES "icc") @@ -563,8 +563,8 @@ endif (CMAKE_SYSTEM_NAME MATCHES Linux) if (CMAKE_SYSTEM_NAME MATCHES BSD) set ( _KDE4_PLATFORM_DEFINITIONS -D_GNU_SOURCE ) - set ( CMAKE_SHARED_LINKER_FLAGS "-avoid-version -lc") - set ( CMAKE_MODULE_LINKER_FLAGS "-avoid-version -lc") + set ( CMAKE_SHARED_LINKER_FLAGS "-lc") + set ( CMAKE_MODULE_LINKER_FLAGS "-lc") endif (CMAKE_SYSTEM_NAME MATCHES BSD) # compiler specific stuff, maybe this should be done differently, Alex |