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?
Andreas
--
You will obey or molten silver will be poured into your ears.
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 (Boost_FIND_VERSION_MAJOR)
+ set(KDE_MIN_VERSION "${Boost_FIND_VERSION_MAJOR}")
+ else (Boost_FIND_VERSION_MAJOR)
+ set(KDE_MIN_VERSION "3")
+ endif (Boost_FIND_VERSION_MAJOR)
+ if (Boost_FIND_VERSION_MINOR)
+ set(KDE_MIN_VERSION "${KDE_MIN_VERSION}.${Boost_FIND_VERSION_MINOR}")
+ else (Boost_FIND_VERSION_MINOR)
+ set(KDE_MIN_VERSION "${KDE_MIN_VERSION}.9")
+ endif (Boost_FIND_VERSION_MINOR)
+ if (Boost_FIND_VERSION_PATCH)
+ set(KDE_MIN_VERSION "${KDE_MIN_VERSION}.${Boost_FIND_VERSION_PATCH}")
+ else (Boost_FIND_VERSION_PATCH)
+ set(KDE_MIN_VERSION "${KDE_MIN_VERSION}.0")
+ endif (Boost_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
