diff --git a/CMakeLists.txt b/CMakeLists.txt index 462ef9a..5f0fdee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,9 +10,6 @@ set(PROJECT_VERSION_MAJOR 6) set(CMAKE_C_STANDARD 99) set(QT_MIN_VERSION "6.6.0") -#set(KF6_MIN_VERSION "5.240.0") -#set(KDE_COMPILERSETTINGS_LEVEL "5.82") - set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -22,15 +19,15 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH}) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) -include(ECMSetupVersion) -include(ECMDeprecationSettings) +#include(ECMSetupVersion) +#include(ECMDeprecationSettings) include(ECMGenerateHeaders) include(CMakePackageConfigHelpers) #include(FeatureSummary) include(GenerateExportHeader) #include(KDEClangFormat) include(ECMQtDeclareLoggingCategory) -include(ECMQmlModule) +#include(ECMQmlModule) find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml) @@ -47,17 +44,17 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu90") set(CMAKE_AUTOMOC ON) -ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX LAYERSHELLQT - VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/layershellqt_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/LayerShellQtConfigVersion.cmake" - SOVERSION ${PROJECT_VERSION_MAJOR}) +#ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX LAYERSHELLQT +# VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/layershellqt_version.h" +# PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/LayerShellQtConfigVersion.cmake" +# SOVERSION ${PROJECT_VERSION_MAJOR}) file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h) #kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) -ecm_set_disabled_deprecation_versions(QT 6.5 - KF 5.240 -) +#ecm_set_disabled_deprecation_versions(QT 6.5 +# KF 5.240 +#) add_subdirectory(src) #add_subdirectory(tests) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3cbbe39..6f10d52 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -47,13 +47,13 @@ if (TARGET Qt::XkbCommonSupportPrivate) target_link_libraries(layer-shell Qt::XkbCommonSupportPrivate) endif() -ecm_generate_headers(LayerShellQt_HEADERS - HEADER_NAMES - Shell - Window - RELATIVE interfaces/ - REQUIRED_HEADERS LayerShellQt_HEADERS -) +#ecm_generate_headers(LayerShellQt_HEADERS +# HEADER_NAMES +# Shell +# Window +# RELATIVE interfaces/ +# REQUIRED_HEADERS LayerShellQt_HEADERS +#) generate_export_header(LayerShellQtInterface diff --git a/src/declarative/CMakeLists.txt b/src/declarative/CMakeLists.txt index c97d6fd..f01ea5f 100644 --- a/src/declarative/CMakeLists.txt +++ b/src/declarative/CMakeLists.txt @@ -3,10 +3,10 @@ set(BUILD_SHARED_LIBS ON) -ecm_add_qml_module(LayerShellQtQml +qt_add_qml_module(LayerShellQtQml URI "org.kde.layershell" VERSION 1.0 SOURCES layershellqtplugin.cpp) target_link_libraries(LayerShellQtQml PRIVATE Qt::Qml LayerShellQtInterface) -ecm_finalize_qml_module(LayerShellQtQml DESTINATION ${KDE_INSTALL_QMLDIR}) +#ecm_finalize_qml_module(LayerShellQtQml DESTINATION ${KDE_INSTALL_QMLDIR})