[khelpcenter/Applications/17.08] /: Fix version comparison (unbreak compilation with 5.36)
Luigi Toscano
null at kde.org
Fri Aug 4 08:43:02 UTC 2017
Git commit 2d6b7d6e1fac7e311e5facd35717ec4aa7e4c0aa by Luigi Toscano.
Committed on 04/08/2017 at 08:41.
Pushed by ltoscano into branch 'Applications/17.08'.
Fix version comparison (unbreak compilation with 5.36)
Sorry for the off-by-one error.
CCMAIL: release-team at kde.org
M +2 -1 CMakeLists.txt
M +2 -1 searchhandlers/CMakeLists.txt
https://commits.kde.org/khelpcenter/2d6b7d6e1fac7e311e5facd35717ec4aa7e4c0aa
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ec87e8..098211e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,8 @@ kconfig_add_kcfg_files(khelpcenter_KDEINIT_SRCS prefs.kcfgc )
kf5_add_kdeinit_executable( khelpcenter ${khelpcenter_KDEINIT_SRCS})
target_compile_definitions(kdeinit_khelpcenter PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}")
target_link_libraries(kdeinit_khelpcenter KF5::KHtml KF5::Service KF5::DBusAddons KF5::ConfigGui KF5::WindowSystem KF5::Bookmarks Qt5::Xml Grantlee5::Templates)
-if (${KF5_VERSION} VERSION_GREATER 5.36.0)
+if (${KF5_VERSION} VERSION_GREATER 5.35.0)
+ # practically means >=5.36
target_link_libraries(kdeinit_khelpcenter KF5::DocTools)
endif()
install(TARGETS kdeinit_khelpcenter ${INSTALL_TARGETS_DEFAULT_ARGS} )
diff --git a/searchhandlers/CMakeLists.txt b/searchhandlers/CMakeLists.txt
index f39fa1f..298a32e 100644
--- a/searchhandlers/CMakeLists.txt
+++ b/searchhandlers/CMakeLists.txt
@@ -17,7 +17,8 @@ add_executable(khc_xapianindexer ${khc_xapianindexer_SOURCES})
kde_target_enable_exceptions(khc_xapianindexer PRIVATE)
ecm_mark_nongui_executable(khc_xapianindexer)
target_link_libraries(khc_xapianindexer Qt5::Core KF5::Archive ${XAPIAN_LIBRARIES} ${LIBXML2_LIBRARIES})
-if (${KF5_VERSION} VERSION_GREATER 5.36.0)
+if (${KF5_VERSION} VERSION_GREATER 5.35.0)
+ # practically means >=5.36
target_link_libraries(khc_xapianindexer KF5::DocTools)
endif()
install(TARGETS khc_xapianindexer DESTINATION ${LIBEXEC_INSTALL_DIR})
More information about the release-team
mailing list