diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-08-20 23:34:36 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-08-20 23:34:36 +0000 |
| commit | 65b7a8a860cd48f219914f989d0ec52bd4e2685a (patch) | |
| tree | 74832d74e7a1cf1509363496a3bcd1416768f9c9 | |
| parent | 3b35b9f193a88d6d174aef3da979729952a7a261 (diff) | |
| download | extra-cmake-modules-65b7a8a860cd48f219914f989d0ec52bd4e2685a.tar.gz extra-cmake-modules-65b7a8a860cd48f219914f989d0ec52bd4e2685a.tar.bz2 | |
-disable setting the LINK_INTERFACE_LIBRARIES temporarily for cmake cvs HEAD and the soon to be released 2.6.2,
since what is silently ignored and fails at link time now (or is hacked working as jaroslaw did) will fail the
at cmake time, which is better, but will break e.g. Jaroslaws workarounds
This will be fixed correctly when I'm back from vacation in two weeks.
Alex
svn path=/trunk/KDE/kdelibs/; revision=850198
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 041c90a3..5ca46f96 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -582,9 +582,16 @@ option(KDE4_ENABLE_HTMLHANDBOOK "Create targets htmlhandbook for creating the h # disable this for now for Windows, since there is an issue with the use of "debug" and # "optimized" in the LINK_INTERFACE_LIBRARIES target property, Alex -if (WIN32) + +# disable the reduced linking temporarily for Windows, cmake HEAD and the soon-to-be-released cmake 2.6.2 +# With 2.6.0 and 2.6.1 it can happen that the "debug", "optimized" and "general" keywords are +# misinterpreted by cmake as library names, the linking fails. Usually this happens under Windows. +# In 2.6.2 this will be an error at cmake time, so we disable it for now and once we require +# 2.6.2 we'll fix it the right way (using TARGET_LINK_LIBRARIES(foo LINK_INTERFACE_LIBRARIES ...) +if (WIN32 OR "${CMAKE_MINOR_VERSION}" EQUAL 7 OR "${CMAKE_PATCH_VERSION}" EQUAL 2) set(KDE4_DISABLE_PROPERTY_ "DISABLED_") -endif(WIN32) +endif (WIN32 OR "${CMAKE_MINOR_VERSION}" EQUAL 7 OR "${CMAKE_PATCH_VERSION}" EQUAL 2) +#endif(WIN32) # option(KDE4_ENABLE_EXPERIMENTAL_LIB_EXPORT "Enable the experimental reduced library exports" FALSE) # # If enabled, make it empty, so the property will keep it's actual name. |