Don't use ECM for plugin
This commit is contained in:
		
							parent
							
								
									97b759c92a
								
							
						
					
					
						commit
						4b1134c439
					
				
					 2 changed files with 7 additions and 10 deletions
				
			
		| 
						 | 
					@ -10,9 +10,6 @@ set(PROJECT_VERSION_MAJOR 6)
 | 
				
			||||||
set(CMAKE_C_STANDARD 99)
 | 
					set(CMAKE_C_STANDARD 99)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
set(QT_MIN_VERSION "6.6.0")
 | 
					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 20)
 | 
				
			||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
 | 
					set(CMAKE_CXX_STANDARD_REQUIRED ON)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -23,14 +20,14 @@ include(KDEInstallDirs)
 | 
				
			||||||
include(KDECMakeSettings)
 | 
					include(KDECMakeSettings)
 | 
				
			||||||
include(KDECompilerSettings NO_POLICY_SCOPE)
 | 
					include(KDECompilerSettings NO_POLICY_SCOPE)
 | 
				
			||||||
include(ECMSetupVersion)
 | 
					include(ECMSetupVersion)
 | 
				
			||||||
include(ECMDeprecationSettings)
 | 
					#include(ECMDeprecationSettings)
 | 
				
			||||||
include(ECMGenerateHeaders)
 | 
					include(ECMGenerateHeaders)
 | 
				
			||||||
include(CMakePackageConfigHelpers)
 | 
					include(CMakePackageConfigHelpers)
 | 
				
			||||||
#include(FeatureSummary)
 | 
					#include(FeatureSummary)
 | 
				
			||||||
include(GenerateExportHeader)
 | 
					include(GenerateExportHeader)
 | 
				
			||||||
#include(KDEClangFormat)
 | 
					#include(KDEClangFormat)
 | 
				
			||||||
include(ECMQtDeclareLoggingCategory)
 | 
					include(ECMQtDeclareLoggingCategory)
 | 
				
			||||||
include(ECMQmlModule)
 | 
					#include(ECMQmlModule)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml)
 | 
					find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml)
 | 
				
			||||||
| 
						 | 
					@ -55,9 +52,9 @@ ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX LAYERSHELLQT
 | 
				
			||||||
file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
 | 
					file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
 | 
				
			||||||
#kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
 | 
					#kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ecm_set_disabled_deprecation_versions(QT 6.5
 | 
					#ecm_set_disabled_deprecation_versions(QT 6.5
 | 
				
			||||||
    KF 5.240
 | 
					#    KF 5.240
 | 
				
			||||||
)
 | 
					#)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
add_subdirectory(src)
 | 
					add_subdirectory(src)
 | 
				
			||||||
#add_subdirectory(tests)
 | 
					#add_subdirectory(tests)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,10 +3,10 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
set(BUILD_SHARED_LIBS ON)
 | 
					set(BUILD_SHARED_LIBS ON)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ecm_add_qml_module(LayerShellQtQml
 | 
					qt_add_qml_module(LayerShellQtQml
 | 
				
			||||||
                  URI "org.kde.layershell"
 | 
					                  URI "org.kde.layershell"
 | 
				
			||||||
                  VERSION 1.0
 | 
					                  VERSION 1.0
 | 
				
			||||||
                  SOURCES layershellqtplugin.cpp)
 | 
					                  SOURCES layershellqtplugin.cpp)
 | 
				
			||||||
target_link_libraries(LayerShellQtQml PRIVATE Qt::Qml LayerShellQtInterface)
 | 
					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})
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue