diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,31 +1,28 @@ -project(KAsync) +cmake_minimum_required(VERSION 3.0) -cmake_minimum_required(VERSION 2.8.12) +project(KAsync VERSION 0.1.0) # ECM setup find_package(ECM 5.10.0 CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(GenerateExportHeader) include(ECMGenerateHeaders) include(ECMGeneratePriFile) -include(ECMPackageConfigHelpers) +include(CMakePackageConfigHelpers) include(ECMSetupVersion) include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) -set(KASYNC_VERSION "4.99.0") - -set(KF5_VERSION "5.10.0") set(QT_REQUIRED_VERSION "5.2.0") -ecm_setup_version(${KASYNC_VERSION} +ecm_setup_version(${KAsync_VERSION} VARIABLE_PREFIX KASYNC VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kasync_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5AsyncConfigVersion.cmake" - SOVERSION 5 + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KAsyncConfigVersion.cmake" + SOVERSION 0 ) @@ -38,30 +35,30 @@ ########### CMake Config Files ########### -set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Async") +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KAsync") -ecm_configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KF5AsyncConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KF5AsyncConfig.cmake" +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KAsyncConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KAsyncConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KF5AsyncConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KF5AsyncConfigVersion.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KAsyncConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KAsyncConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) install(EXPORT - KF5AsyncTargets + KAsyncTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - FILE KF5AsyncTargets.cmake - NAMESPACE KF5::) + FILE KAsyncTargets.cmake + ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kasync_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/KAsyncConfig.cmake.in b/KAsyncConfig.cmake.in new file mode 100644 --- /dev/null +++ b/KAsyncConfig.cmake.in @@ -0,0 +1,3 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/KAsyncTargets.cmake") diff --git a/KF5AsyncConfig.cmake.in b/KF5AsyncConfig.cmake.in deleted file mode 100644 --- a/KF5AsyncConfig.cmake.in +++ /dev/null @@ -1,3 +0,0 @@ -@PACKAGE_INIT@ - -include("${CMAKE_CURRENT_LIST_DIR}/KF5AsyncTargets.cmake") diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -2,5 +2,5 @@ ecm_add_test(asynctest.cpp TEST_NAME asynctest - LINK_LIBRARIES KF5Async Qt5::Test + LINK_LIBRARIES KAsync Qt5::Test ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,41 +18,40 @@ ) -add_library(KF5Async ${kasync_SRCS}) -add_library(KF5::Async ALIAS KF5Async) +add_library(KAsync ${kasync_SRCS}) -generate_export_header(KF5Async BASE_NAME kasync) +generate_export_header(KAsync BASE_NAME kasync) -target_include_directories(KF5Async INTERFACE "$") -target_include_directories(KF5Async PUBLIC "$") +target_include_directories(KAsync INTERFACE "$") +target_include_directories(KAsync PUBLIC "$") -target_link_libraries(KF5Async +target_link_libraries(KAsync PUBLIC Qt5::Core ) -set_target_properties(KF5Async PROPERTIES +set_target_properties(KAsync PROPERTIES VERSION ${KASYNC_VERSION_STRING} SOVERSION ${KASYNC_SOVERSION} EXPORT_NAME Async ) ecm_generate_pri_file(BASE_NAME KAsync - LIB_NAME KF5Async + LIB_NAME KAsync FILENAME_VAR PRI_FILENAME ) install(TARGETS - KF5Async - EXPORT KF5AsyncTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} + KAsync + EXPORT KAsyncTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kasync_export.h ${kasync_HEADERS} ${kasync_priv_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/Async + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/Async COMPONENT Devel )