On 07.08.08 19:59:52, Thiago Macieira wrote:
> Andreas Pakulat wrote:
> >Hi,
> >
> >since we require Cmake 2.6 now I think we should support CMake's
> >"integrated" way of version-checking. CMake 2.6 supports this:
> >
> >find_package(KDE4 4.2.0)
> >
> >and I'm proposing the attached patch to make this work. This removes the
> >need for setting an extra variable before calling find_package, still
> >KDE_MIN_VERSION is given authority over the cmake-way for backwards
> >compatibility reasons.
> >
> >Objections against comitting this?
>
> Are you sure? This reads Boost_*.
Damn, sorry. Here's the right patch :)
There's one drawback of this whole thing I just noticed: When somebody
puts:
find_package(KDE4 4 REQUIRED)
in his CMakeLists.txt that won't work unless he runs KDE5. I'm not sure
how to best fix this, one way would be to require at least MAJOR+MINOR
version and else use 3.9 as default. The other would be to "0" as
default value for minor.
Andreas
--
Many changes of mind and mood; do not hesitate too long.
Index: FindKDE4Internal.cmake
===================================================================
--- FindKDE4Internal.cmake (Revision 843662)
+++ FindKDE4Internal.cmake (Arbeitskopie)
@@ -352,7 +352,21 @@
# we need at least this version:
if (NOT KDE_MIN_VERSION)
- set(KDE_MIN_VERSION "3.9.0")
+ if (KDE4_FIND_VERSION_MAJOR)
+ set(KDE_MIN_VERSION "${KDE4_FIND_VERSION_MAJOR}")
+ else (KDE4_FIND_VERSION_MAJOR)
+ set(KDE_MIN_VERSION "3")
+ endif (KDE4_FIND_VERSION_MAJOR)
+ if (KDE4_FIND_VERSION_MINOR)
+ set(KDE_MIN_VERSION "${KDE_MIN_VERSION}.${KDE4_FIND_VERSION_MINOR}")
+ else (KDE4_FIND_VERSION_MINOR)
+ set(KDE_MIN_VERSION "${KDE_MIN_VERSION}.9")
+ endif (KDE4_FIND_VERSION_MINOR)
+ if (KDE4_FIND_VERSION_PATCH)
+ set(KDE_MIN_VERSION "${KDE_MIN_VERSION}.${KDE4_FIND_VERSION_PATCH}")
+ else (KDE4_FIND_VERSION_PATCH)
+ set(KDE_MIN_VERSION "${KDE_MIN_VERSION}.0")
+ endif (KDE4_FIND_VERSION_PATCH)
endif (NOT KDE_MIN_VERSION)
#message(STATUS "KDE_MIN_VERSION=${KDE_MIN_VERSION} found ${KDEVERSION}")
_______________________________________________
Kde-buildsystem mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-buildsystem
