Skip to content

Commit 74b0251

Browse files
authored
Cmake fixes (#885)
* Add required macos frameworks * Make building tests optional * Add missing source and header files from cmakelists
1 parent a449aa8 commit 74b0251

3 files changed

Lines changed: 12 additions & 1 deletion

File tree

CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,13 @@ target_link_libraries(Attorney_Online PRIVATE Qt5::Core Qt5::Gui Qt5::Network Qt
3737
Qt5::WebSockets bass bassmidi bassopus discord-rpc)
3838
target_compile_definitions(Attorney_Online PRIVATE DISCORD)
3939

40+
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
41+
target_link_libraries(Attorney_Online PRIVATE "-framework CoreFoundation" "-framework Foundation" "-framework CoreServices")
42+
endif()
43+
4044
# Subdirectories
41-
add_subdirectory(test)
45+
if (AO_BUILD_TESTS)
46+
add_subdirectory(test)
47+
endif()
4248
add_subdirectory(src)
4349
add_subdirectory(include)

include/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ aocaseannouncerdialog.h
66
aocharbutton.h
77
aoclocklabel.h
88
aoemotebutton.h
9+
aoemotepreview.h
910
aoevidencebutton.h
1011
aoevidencedisplay.h
1112
aoimage.h
@@ -15,6 +16,7 @@ aooptionsdialog.h
1516
aopacket.h
1617
aosfxplayer.h
1718
aotextarea.h
19+
aoutils.h
1820
bass.h
1921
bassmidi.h
2022
bassopus.h

src/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,18 @@ aocaseannouncerdialog.cpp
66
aocharbutton.cpp
77
aoclocklabel.cpp
88
aoemotebutton.cpp
9+
aoemotepreview.cpp
910
aoevidencebutton.cpp
1011
aoevidencedisplay.cpp
1112
aoimage.cpp
1213
aolayer.cpp
1314
aomusicplayer.cpp
1415
aooptionsdialog.cpp
16+
aoclocklabel.cpp
1517
aopacket.cpp
1618
aosfxplayer.cpp
1719
aotextarea.cpp
20+
aoutils.cpp
1821
charselect.cpp
1922
chatlogpiece.cpp
2023
courtroom.cpp

0 commit comments

Comments
 (0)