diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2020-01-07 16:34:48 +0300 |
|---|---|---|
| committer | Hannah von Reth <vonreth@kde.org> | 2020-01-09 17:39:32 +0300 |
| commit | 6725cd5826f13dde8996f638a0d28ebb5aaa3531 (patch) | |
| tree | 1317527dcee1d149051503fdb1e11df1d04c0a31 /CMakeLists.txt | |
| parent | f17b30515167d3e679f30118e52c41385787faba (diff) | |
[CMAKE] Resolve some issues discovered during review
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d07dce0a3..7a67e2b95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,17 @@ cmake_minimum_required(VERSION 3.1) set(CMAKE_CXX_STANDARD 14) -project(client LANGUAGES CXX C VERSION 2.7.0) +include(VERSION.cmake) +project(client LANGUAGES CXX C VERSION ${MIRALL_VERSION_MAJOR}.${MIRALL_VERSION_MINOR}.${MIRALL_VERSION_PATCH}) include(FeatureSummary) find_package(ECM 5.50.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH}) +set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH}) + +# disable pointless warning in KDECMakeSettings +set(APPLE_SUPPRESS_X11_WARNING ON) include(KDEInstallDirs) include(KDECMakeSettings) @@ -16,14 +20,9 @@ include(ECMMarkNonGuiExecutable) include(KDECompilerSettings NO_POLICY_SCOPE) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_AUTOUIC ON) if (APPLE OR WIN32) set(USE_OUR_OWN_SQLITE3 TRUE) - set(SQLITE3_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/3rdparty/sqlite3) - set(SQLITE3_LIBRARIES "") - set(SQLITE3_SOURCE ${SQLITE3_INCLUDE_DIR}/sqlite3.c) - MESSAGE(STATUS "Using own sqlite3 from " ${SQLITE3_INCLUDE_DIR}) else() find_package(SQLite3 3.9.0 REQUIRED) endif() @@ -185,7 +184,7 @@ set(TRANSLATIONS ${TRANS_FILES}) if(APPLE) - list(APPEND OWNCLOUD_BUNDLED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/sync-exclude.lst) + list(APPEND OWNCLOUD_BUNDLED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/sync-exclude.lst") elseif(BUILD_CLIENT) configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY) install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} ) |