Cmake fixes (#885)
* Add required macos frameworks * Make building tests optional * Add missing source and header files from cmakelists
This commit is contained in:
		
							parent
							
								
									a449aa86e9
								
							
						
					
					
						commit
						74b02513e3
					
				@ -37,7 +37,13 @@ target_link_libraries(Attorney_Online PRIVATE Qt5::Core Qt5::Gui Qt5::Network Qt
 | 
				
			|||||||
    Qt5::WebSockets bass bassmidi bassopus discord-rpc)
 | 
					    Qt5::WebSockets bass bassmidi bassopus discord-rpc)
 | 
				
			||||||
target_compile_definitions(Attorney_Online PRIVATE DISCORD)
 | 
					target_compile_definitions(Attorney_Online PRIVATE DISCORD)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 | 
				
			||||||
 | 
					    target_link_libraries(Attorney_Online PRIVATE "-framework CoreFoundation" "-framework Foundation" "-framework CoreServices")
 | 
				
			||||||
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Subdirectories
 | 
					# Subdirectories
 | 
				
			||||||
add_subdirectory(test)
 | 
					if (AO_BUILD_TESTS)
 | 
				
			||||||
 | 
					    add_subdirectory(test)
 | 
				
			||||||
 | 
					endif()
 | 
				
			||||||
add_subdirectory(src)
 | 
					add_subdirectory(src)
 | 
				
			||||||
add_subdirectory(include)
 | 
					add_subdirectory(include)
 | 
				
			||||||
 | 
				
			|||||||
@ -6,6 +6,7 @@ aocaseannouncerdialog.h
 | 
				
			|||||||
aocharbutton.h
 | 
					aocharbutton.h
 | 
				
			||||||
aoclocklabel.h
 | 
					aoclocklabel.h
 | 
				
			||||||
aoemotebutton.h
 | 
					aoemotebutton.h
 | 
				
			||||||
 | 
					aoemotepreview.h
 | 
				
			||||||
aoevidencebutton.h
 | 
					aoevidencebutton.h
 | 
				
			||||||
aoevidencedisplay.h
 | 
					aoevidencedisplay.h
 | 
				
			||||||
aoimage.h
 | 
					aoimage.h
 | 
				
			||||||
@ -15,6 +16,7 @@ aooptionsdialog.h
 | 
				
			|||||||
aopacket.h
 | 
					aopacket.h
 | 
				
			||||||
aosfxplayer.h
 | 
					aosfxplayer.h
 | 
				
			||||||
aotextarea.h
 | 
					aotextarea.h
 | 
				
			||||||
 | 
					aoutils.h
 | 
				
			||||||
bass.h
 | 
					bass.h
 | 
				
			||||||
bassmidi.h
 | 
					bassmidi.h
 | 
				
			||||||
bassopus.h
 | 
					bassopus.h
 | 
				
			||||||
 | 
				
			|||||||
@ -6,15 +6,18 @@ aocaseannouncerdialog.cpp
 | 
				
			|||||||
aocharbutton.cpp
 | 
					aocharbutton.cpp
 | 
				
			||||||
aoclocklabel.cpp
 | 
					aoclocklabel.cpp
 | 
				
			||||||
aoemotebutton.cpp
 | 
					aoemotebutton.cpp
 | 
				
			||||||
 | 
					aoemotepreview.cpp
 | 
				
			||||||
aoevidencebutton.cpp
 | 
					aoevidencebutton.cpp
 | 
				
			||||||
aoevidencedisplay.cpp
 | 
					aoevidencedisplay.cpp
 | 
				
			||||||
aoimage.cpp
 | 
					aoimage.cpp
 | 
				
			||||||
aolayer.cpp
 | 
					aolayer.cpp
 | 
				
			||||||
aomusicplayer.cpp
 | 
					aomusicplayer.cpp
 | 
				
			||||||
aooptionsdialog.cpp
 | 
					aooptionsdialog.cpp
 | 
				
			||||||
 | 
					aoclocklabel.cpp
 | 
				
			||||||
aopacket.cpp
 | 
					aopacket.cpp
 | 
				
			||||||
aosfxplayer.cpp
 | 
					aosfxplayer.cpp
 | 
				
			||||||
aotextarea.cpp
 | 
					aotextarea.cpp
 | 
				
			||||||
 | 
					aoutils.cpp
 | 
				
			||||||
charselect.cpp
 | 
					charselect.cpp
 | 
				
			||||||
chatlogpiece.cpp
 | 
					chatlogpiece.cpp
 | 
				
			||||||
courtroom.cpp
 | 
					courtroom.cpp
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user