Convert external_statusnotifieritem to OBJECT library.
This commit is contained in:
		
							parent
							
								
									7b5d3e01c0
								
							
						
					
					
						commit
						4a9d6177f9
					
				
					 2 changed files with 10 additions and 6 deletions
				
			
		
							
								
								
									
										1
									
								
								external/dbusmenu_qt/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								external/dbusmenu_qt/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -27,6 +27,7 @@ else()
 | 
				
			||||||
    set(CMAKE_AUTOMOC_RELAXED_MODE ON)
 | 
					    set(CMAKE_AUTOMOC_RELAXED_MODE ON)
 | 
				
			||||||
    set_target_properties(external_dbusmenu_qt PROPERTIES AUTOMOC ON AUTORCC ON)
 | 
					    set_target_properties(external_dbusmenu_qt PROPERTIES AUTOMOC ON AUTORCC ON)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    include(CheckCXXSourceCompiles)
 | 
				
			||||||
    check_cxx_source_compiles("
 | 
					    check_cxx_source_compiles("
 | 
				
			||||||
    #include <QtGui/QIcon>
 | 
					    #include <QtGui/QIcon>
 | 
				
			||||||
    int main() {
 | 
					    int main() {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										15
									
								
								external/statusnotifieritem/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										15
									
								
								external/statusnotifieritem/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -4,13 +4,13 @@
 | 
				
			||||||
# For license and copyright information please follow this link:
 | 
					# For license and copyright information please follow this link:
 | 
				
			||||||
# https://github.com/desktop-app/legal/blob/master/LEGAL
 | 
					# https://github.com/desktop-app/legal/blob/master/LEGAL
 | 
				
			||||||
 | 
					
 | 
				
			||||||
add_library(external_statusnotifieritem INTERFACE IMPORTED GLOBAL)
 | 
					add_library(external_statusnotifieritem OBJECT)
 | 
				
			||||||
add_library(desktop-app::external_statusnotifieritem ALIAS external_statusnotifieritem)
 | 
					add_library(desktop-app::external_statusnotifieritem ALIAS external_statusnotifieritem)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
set(statusnotifieritem_loc ${third_party_loc}/statusnotifieritem)
 | 
					set(statusnotifieritem_loc ${third_party_loc}/statusnotifieritem)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
nice_target_sources(external_statusnotifieritem ${statusnotifieritem_loc}
 | 
					nice_target_sources(external_statusnotifieritem ${statusnotifieritem_loc}
 | 
				
			||||||
INTERFACE
 | 
					PRIVATE
 | 
				
			||||||
    dbustypes.cpp
 | 
					    dbustypes.cpp
 | 
				
			||||||
    dbustypes.h
 | 
					    dbustypes.h
 | 
				
			||||||
    statusnotifieritem.cpp
 | 
					    statusnotifieritem.cpp
 | 
				
			||||||
| 
						 | 
					@ -23,15 +23,18 @@ qt5_add_dbus_adaptor(sni_adaptor
 | 
				
			||||||
    StatusNotifierItem
 | 
					    StatusNotifierItem
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
target_sources(external_statusnotifieritem INTERFACE ${sni_adaptor})
 | 
					set_target_properties(external_statusnotifieritem PROPERTIES AUTOMOC ON)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					target_sources(external_statusnotifieritem PRIVATE ${sni_adaptor})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
target_include_directories(external_statusnotifieritem
 | 
					target_include_directories(external_statusnotifieritem
 | 
				
			||||||
INTERFACE
 | 
					PUBLIC
 | 
				
			||||||
    ${statusnotifieritem_loc}
 | 
					    ${statusnotifieritem_loc}
 | 
				
			||||||
    "${CMAKE_CURRENT_BINARY_DIR}")
 | 
					    "${CMAKE_CURRENT_BINARY_DIR}"
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
target_link_libraries(external_statusnotifieritem
 | 
					target_link_libraries(external_statusnotifieritem
 | 
				
			||||||
INTERFACE
 | 
					PUBLIC
 | 
				
			||||||
    desktop-app::external_dbusmenu_qt
 | 
					    desktop-app::external_dbusmenu_qt
 | 
				
			||||||
    desktop-app::external_qt
 | 
					    desktop-app::external_qt
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue