diff options
| author | Jonathan Riddell <jr@jriddell.org> | 2017-10-03 10:47:20 (GMT) |
|---|---|---|
| committer | Jonathan Riddell <jr@jriddell.org> | 2017-10-03 10:47:20 (GMT) |
| commit | 5e00375f181968e5a73ae5727b0ea1696bec97ca (patch) | |
| tree | a57d72e5d1bbfd2d72c11296f408c921c3030c2e | |
| parent | fe9602fbbda705cff6ef3d1028a133d49cd037fb (diff) | |
| parent | fea3844702de56f24d864d630cc0bb496716bbbf (diff) | |
merge Applications/17.08
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | KPimGAPIConfig.cmake.in | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c4d93a..7beb009 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,8 +23,13 @@ include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) +<<<<<<< HEAD set(KCALENDARCORE_LIB_VERSION "5.6.40") set(KCONTACTS_LIB_VERSION "5.6.40") +======= +set(KCALENDARCORE_LIB_VERSION "5.6.2") +set(KCONTACTS_LIB_VERSION "5.6.2") +>>>>>>> Applications/17.08 ecm_setup_version(PROJECT VARIABLE_PREFIX KGAPI diff --git a/KPimGAPIConfig.cmake.in b/KPimGAPIConfig.cmake.in index 2f2d530..3d0db46 100644 --- a/KPimGAPIConfig.cmake.in +++ b/KPimGAPIConfig.cmake.in @@ -1,5 +1,7 @@ @PACKAGE_INIT@ +include(CMakeFindDependencyMacro) + find_dependency(KF5CalendarCore "@KCALENDARCORE_LIB_VERSION@") find_dependency(KF5Contacts "@KCONTACTS_LIB_VERSION@") |