CMake: Fix build errors exposed by making common dependent on fmt

This commit is contained in:
JosJuice 2020-10-14 20:50:38 +02:00
parent 1084cfec1a
commit cb14b65aad
5 changed files with 19 additions and 1 deletions

View File

@ -308,6 +308,14 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
# Drop unreachable code and data.
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dead_strip,-dead_strip_dylibs")
# Set -fno-objc-exceptions, for consistency with -fno-exceptions earlier.
# If we set only -fno-exceptions, fmt fails to compile when included from
# Objective-C++ because fmt tries try to use throw because __EXCEPTIONS is defined.
#
# TODO: Only enable this for Objective-C(++).
# We get warnings if we enable this when building regular C(++) code.
check_and_add_flag(NO_OBJC_EXCEPTIONS -fno-objc-exceptions)
find_library(APPKIT_LIBRARY AppKit)
find_library(APPSERV_LIBRARY ApplicationServices)
find_library(CARBON_LIBRARY Carbon)

View File

@ -8,6 +8,7 @@ add_library(androidcommon STATIC
target_link_libraries(androidcommon
PRIVATE
android
common
log
"-Wl,--no-warn-mismatch"
"-Wl,--whole-archive"

View File

@ -10,6 +10,7 @@ add_library(main SHARED
target_link_libraries(main
PRIVATE
androidcommon
common
core
uicommon
)

View File

@ -75,4 +75,11 @@ if(WIN32)
)
endif()
target_link_libraries(audiocommon PRIVATE cubeb SoundTouch FreeSurround)
target_link_libraries(audiocommon
PUBLIC
common
PRIVATE
cubeb
SoundTouch
FreeSurround)

View File

@ -58,6 +58,7 @@ add_library(discio
target_link_libraries(discio
PUBLIC
common
BZip2::BZip2
LibLZMA::LibLZMA
zstd