sean-m
/
keysmith
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup CMakeLists.txt a bit 

* do cmake_minimum_required as first thing, as recommended
* bump KF to 5.37, first release with Kirigami (Qt 5.7 matching min dep)
* use KF5_MIN_VERSION also with ECM
* include KDE CMake settings as first
* remove unused cmake includes
* remove duplicated enable_testing()
* use correct KDEInstallDirs variables
master
Friedrich W. H. Kossebau 2019-12-18 17:29:13 +01:00
parent 534d973658
commit 7daddb524c
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
View File

@ -1,12 +1,10 @@
# Need 3.10.3 for C++17 support enabled via CMake: https://cmake.org/cmake/help/v3.10/prop_tgt/CXX_STANDARD.html#prop_tgt:CXX_STANDARD
cmake_minimum_required(VERSION 3.10.3)
project(keysmith)
#
# Need 3.10.3 for C++17 support enabled via CMake: https://cmake.org/cmake/help/v3.10/prop_tgt/CXX_STANDARD.html#prop_tgt:CXX_STANDARD
#
cmake_minimum_required(VERSION 3.10.3)
set(KF5_MIN_VERSION "5.18.0")
set(QT_MIN_VERSION "5.5.0")
set(KF5_MIN_VERSION "5.37.0")
set(QT_MIN_VERSION "5.7.0")
################# Disallow in-source build #################
@ -18,19 +16,18 @@ include(FeatureSummary)
################# set KDE specific information #################
find_package(ECM 0.0.8 REQUIRED NO_MODULE)
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_SOURCE_DIR}/cmake/")
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
include(ECMSetupVersion)
include(ECMGenerateHeaders)
include(ECMAddTests)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(ECMPoQmTools)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(ECMAddTests)
include(ECMPoQmTools)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

2
autotests/CMakeLists.txt
View File

@ -1,5 +1,3 @@
enable_testing()
include_directories(BEFORE ../src)
add_subdirectory(validators)

2
src/CMakeLists.txt
View File

@ -16,4 +16,4 @@ target_link_libraries(org.kde.keysmith
${LIBOATH_LIBRARIES}
${keysmith_internal_libs}
)
install(TARGETS org.kde.keysmith ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS org.kde.keysmith ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})