diff options
| author | OmniTroid <davidskoland@gmail.com> | 2023-01-05 08:10:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-05 08:10:30 +0100 |
| commit | 74b02513e36063dabcd8c3b38d18285176406913 (patch) | |
| tree | 9e1659e530d019499f183fb4164b9a7409f26c50 | |
| parent | a449aa86e9f1758b5661fba640a626bc12080988 (diff) | |
Cmake fixes (#885)
* Add required macos frameworks
* Make building tests optional
* Add missing source and header files from cmakelists
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | include/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d7714b6..fad3de08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,13 @@ target_link_libraries(Attorney_Online PRIVATE Qt5::Core Qt5::Gui Qt5::Network Qt Qt5::WebSockets bass bassmidi bassopus discord-rpc) 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 -add_subdirectory(test) +if (AO_BUILD_TESTS) + add_subdirectory(test) +endif() add_subdirectory(src) add_subdirectory(include) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index a46afbcd..29ad4fe7 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -6,6 +6,7 @@ aocaseannouncerdialog.h aocharbutton.h aoclocklabel.h aoemotebutton.h +aoemotepreview.h aoevidencebutton.h aoevidencedisplay.h aoimage.h @@ -15,6 +16,7 @@ aooptionsdialog.h aopacket.h aosfxplayer.h aotextarea.h +aoutils.h bass.h bassmidi.h bassopus.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 32e924a7..297a4f46 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,15 +6,18 @@ aocaseannouncerdialog.cpp aocharbutton.cpp aoclocklabel.cpp aoemotebutton.cpp +aoemotepreview.cpp aoevidencebutton.cpp aoevidencedisplay.cpp aoimage.cpp aolayer.cpp aomusicplayer.cpp aooptionsdialog.cpp +aoclocklabel.cpp aopacket.cpp aosfxplayer.cpp aotextarea.cpp +aoutils.cpp charselect.cpp chatlogpiece.cpp courtroom.cpp |