kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Fix build for OS X 10.10-10.11.

Browse source
This commit is contained in:
John Preston 2019-12-31 17:51:54 +03:00
parent b08c57c8d0
commit 4490667520
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
external/auto_updates/xz/CMakeLists.txt vendored
View file

@ -11,14 +11,22 @@ if (DESKTOP_APP_USE_PACKAGED)
find_package(LibLZMA REQUIRED)
target_link_libraries(external_xz INTERFACE LibLZMA::LibLZMA)
elseif (APPLE AND NOT build_osx)
target_include_directories(external_xz
INTERFACE
/usr/local/macos/include
)
target_link_libraries(external_xz
INTERFACE
/usr/local/macos/lib/liblzma.a
)
elseif (APPLE)
target_include_directories(external_xz
INTERFACE
/usr/local/include
)
target_link_libraries(external_xz
INTERFACE
/usr/local/liblzma.a
/usr/local/lib/liblzma.a
)
else()
target_link_static_libraries(external_xz

13
external/opus/CMakeLists.txt vendored
View file

@ -20,10 +20,23 @@ if (WIN32)
${opus_lib_loc}/opus.lib
)
elseif (APPLE AND NOT build_osx)
target_include_directories(external_opus
INTERFACE
/usr/local/macos/include
)
target_link_libraries(external_opus
INTERFACE
/usr/local/macos/lib/libopus.a
)
elseif (APPLE)
target_include_directories(external_opus
INTERFACE
/usr/local/include
)
target_link_libraries(external_opus
INTERFACE
/usr/local/lib/libopus.a
)
else()
target_link_static_libraries(external_opus
INTERFACE