diff --git a/CMakeLists.txt b/CMakeLists.txt index 2aeb379..b6f8cc9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,68 +1,65 @@ cmake_minimum_required(VERSION 3.0) -project(LibKompareDiff2) +project(LibKompareDiff2 VERSION "5.2") set(QT_MIN_VERSION "5.12.0") set(KF_MIN_VERSION "5.68.0") find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) -include(ECMSetupVersion) include(ECMQtDeclareLoggingCategory) include(CMakePackageConfigHelpers) include(FeatureSummary) include(GenerateExportHeader) set(ADDITIONAL_REQUIRED_QT_COMPONENTS) if(BUILD_TESTING) list(APPEND ADDITIONAL_REQUIRED_QT_COMPONENTS Test) endif() find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Widgets ${ADDITIONAL_REQUIRED_QT_COMPONENTS} ) find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS CoreAddons Codecs Config XmlGui I18n KIO ) -set(KOMPAREDIFF2_VERSION "5.2") - add_definitions( -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050F00 -DQT_DEPRECATED_WARNINGS_SINCE=0x060000 -DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_KEYWORDS -DQT_STRICT_ITERATORS -DQT_NO_FOREACH -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054700 -DKF_DEPRECATED_WARNINGS_SINCE=0x060000 ) add_subdirectory(src) if (BUILD_TESTING) add_subdirectory(tests) endif() feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4aac3b0..482fd69 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,101 +1,101 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkomparediff2\") -ecm_setup_version(${KOMPAREDIFF2_VERSION} - VARIABLE_PREFIX LIBKOMPAREDIFF2 - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/LibKompareDiff2ConfigVersion.cmake" - SOVERSION 5 -) +set(LibKompareDiff2_SOVERSION 5) set(komparediff2_SRCS kompareprocess.cpp komparemodellist.cpp diffmodellist.cpp diffmodel.cpp difference.cpp diffhunk.cpp diffsettings.cpp settingsbase.cpp parser.cpp parserbase.cpp cvsdiffparser.cpp diffparser.cpp perforceparser.cpp stringlistpair.cpp kompare.cpp ) ecm_qt_declare_logging_category(komparediff2_SRCS HEADER komparediffdebug.h IDENTIFIER LIBKOMPAREDIFF2 CATEGORY_NAME "libkomparediff" DESCRIPTION "libkomparediff" EXPORT komparediff2 ) add_library(komparediff2 ${komparediff2_SRCS}) generate_export_header(komparediff2 BASE_NAME diff2) target_link_libraries(komparediff2 PUBLIC KF5::XmlGui KF5::ConfigCore Qt5::Widgets Qt5::Core PRIVATE KF5::Codecs KF5::KIOCore KF5::I18n KF5::CoreAddons ) target_include_directories(komparediff2 INTERFACE "$") set_target_properties(komparediff2 PROPERTIES - VERSION ${LIBKOMPAREDIFF2_VERSION_STRING} - SOVERSION ${LIBKOMPAREDIFF2_SOVERSION} + VERSION ${LibKompareDiff2_VERSION} + SOVERSION ${LibKompareDiff2_SOVERSION} EXPORT_NAME "KompareDiff2" ) install(TARGETS komparediff2 EXPORT LibKompareDiff2Targets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/diff2_export.h settingsbase.h diffsettings.h komparemodellist.h difference.h diffmodel.h diffmodellist.h marker.h kompare.h diffhunk.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/libkomparediff2 COMPONENT Devel ) ecm_qt_install_logging_categories( EXPORT komparediff2 FILE libkomparediff2.categories DESTINATION "${KDE_INSTALL_LOGGINGCATEGORIESDIR}" ) # CMake config files set(_LibKompareDiff2_CONFIG_DEST "${KDE_INSTALL_CMAKEPACKAGEDIR}/LibKompareDiff2") configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/LibKompareDiff2Config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/LibKompareDiff2Config.cmake" INSTALL_DESTINATION "${_LibKompareDiff2_CONFIG_DEST}" ) +write_basic_package_version_file( + "${CMAKE_CURRENT_BINARY_DIR}/LibKompareDiff2ConfigVersion.cmake" + COMPATIBILITY SameMajorVersion +) install( FILES "${CMAKE_CURRENT_BINARY_DIR}/LibKompareDiff2ConfigVersion.cmake" "${CMAKE_CURRENT_BINARY_DIR}/LibKompareDiff2Config.cmake" DESTINATION "${_LibKompareDiff2_CONFIG_DEST}" ) install( EXPORT LibKompareDiff2Targets DESTINATION "${_LibKompareDiff2_CONFIG_DEST}" FILE LibKompareDiff2Targets.cmake )