Add support for KFileMetaData
Also fix installing the main view's QML file.
This commit is contained in:
		
					parent
					
						
							
								65ec42d0de
							
						
					
				
			
			
				commit
				
					
						61466d9ce8
					
				
			
		
					 2 changed files with 13 additions and 2 deletions
				
			
		| 
						 | 
					@ -37,6 +37,11 @@ find_package(KF5 ${KF5_VERSION} REQUIRED
 | 
				
			||||||
             # DocTools           # Disabled until manual's ready
 | 
					             # DocTools           # Disabled until manual's ready
 | 
				
			||||||
             )
 | 
					             )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Not a framework yet, hence separate
 | 
				
			||||||
 | 
					find_package(KF5 "5.6.0" COMPONENTS
 | 
				
			||||||
 | 
					            FileMetaData)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
include(ECMInstallIcons)
 | 
					include(ECMInstallIcons)
 | 
				
			||||||
include(KDEInstallDirs)
 | 
					include(KDEInstallDirs)
 | 
				
			||||||
include(KDECompilerSettings)
 | 
					include(KDECompilerSettings)
 | 
				
			||||||
| 
						 | 
					@ -45,6 +50,7 @@ include(FeatureSummary)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 | 
					set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 | 
				
			||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
 | 
					set(CMAKE_INCLUDE_CURRENT_DIR ON)
 | 
				
			||||||
 | 
					set_package_properties(FileMetaData PROPERTIES TYPE OPTIONAL PURPOSE "Required for file tagging")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# add_subdirectory( doc )
 | 
					# add_subdirectory( doc )
 | 
				
			||||||
add_subdirectory( src )
 | 
					add_subdirectory( src )
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -52,6 +52,12 @@ target_link_libraries(danbooru_client PUBLIC
 | 
				
			||||||
                      danbooru
 | 
					                      danbooru
 | 
				
			||||||
                    )
 | 
					                    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if (KF5FileMetaData_FOUND)
 | 
				
			||||||
 | 
					add_definitions(-DWITH_KFILEMETADATA)
 | 
				
			||||||
 | 
					target_link_libraries(danbooru_client PUBLIC
 | 
				
			||||||
 | 
					                      KF5::FileMetaData)
 | 
				
			||||||
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
install(TARGETS danbooru_client ${INSTALL_TARGETS_DEFAULT_ARGS} )
 | 
					install(TARGETS danbooru_client ${INSTALL_TARGETS_DEFAULT_ARGS} )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
########### install files ###############
 | 
					########### install files ###############
 | 
				
			||||||
| 
						 | 
					@ -59,5 +65,4 @@ install(TARGETS danbooru_client ${INSTALL_TARGETS_DEFAULT_ARGS} )
 | 
				
			||||||
install(PROGRAMS danbooru_client.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR} )
 | 
					install(PROGRAMS danbooru_client.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR} )
 | 
				
			||||||
install(FILES danboorusettings.kcfg DESTINATION  ${KCFG_INSTALL_DIR})
 | 
					install(FILES danboorusettings.kcfg DESTINATION  ${KCFG_INSTALL_DIR})
 | 
				
			||||||
install(FILES danbooru-clientui.rc  DESTINATION  ${KXMLGUI_INSTALL_DIR}/danbooru-client)
 | 
					install(FILES danbooru-clientui.rc  DESTINATION  ${KXMLGUI_INSTALL_DIR}/danbooru-client)
 | 
				
			||||||
 | 
					install(FILES qml/danbooruimageview.qml DESTINATION ${DATA_INSTALL_DIR}/danbooru-client)
 | 
				
			||||||
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue