kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Use macOS libs from Libraries/local.

Browse source
This commit is contained in:
John Preston 2021-07-23 18:54:17 +03:00
parent 98c52815e9
commit f343a1634c
11 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,11 +13,11 @@ if (DESKTOP_APP_USE_PACKAGED)
elseif (APPLE) elseif (APPLE)
target_include_directories(external_xz SYSTEM target_include_directories(external_xz SYSTEM
INTERFACE INTERFACE
/usr/local/macos/include ${libs_loc}/local/include
) )
target_link_libraries(external_xz target_link_libraries(external_xz
INTERFACE INTERFACE
/usr/local/macos/lib/liblzma.a ${libs_loc}/local/lib/liblzma.a
) )
else() else()
target_link_static_libraries(external_xz target_link_static_libraries(external_xz

2
external/iconv/CMakeLists.txt vendored
View file

@ -13,6 +13,6 @@ if (APPLE AND DESKTOP_APP_USE_PACKAGED)
elseif (APPLE) elseif (APPLE)
target_link_libraries(external_iconv target_link_libraries(external_iconv
INTERFACE INTERFACE
/usr/local/macos/lib/libiconv.a ${libs_loc}/local/lib/libiconv.a
) )
endif() endif()

2
external/jpeg/CMakeLists.txt vendored
View file

@ -14,7 +14,7 @@ elseif (WIN32)
target_include_directories(external_jpeg SYSTEM INTERFACE ${libs_loc}/mozjpeg) target_include_directories(external_jpeg SYSTEM INTERFACE ${libs_loc}/mozjpeg)
target_link_libraries(external_jpeg INTERFACE ${libs_loc}/mozjpeg/$<IF:$<CONFIG:Debug>,Debug,Release>/jpeg-static.lib) target_link_libraries(external_jpeg INTERFACE ${libs_loc}/mozjpeg/$<IF:$<CONFIG:Debug>,Debug,Release>/jpeg-static.lib)
elseif (APPLE) elseif (APPLE)
target_link_libraries(external_jpeg INTERFACE /usr/local/macos/lib/libjpeg.a) target_link_libraries(external_jpeg INTERFACE ${libs_loc}/local/lib/libjpeg.a)
else() else()
target_link_static_libraries(external_jpeg INTERFACE jpeg) target_link_static_libraries(external_jpeg INTERFACE jpeg)
endif() endif()

8
external/openal/CMakeLists.txt vendored
View file

@ -27,15 +27,15 @@ elseif (WIN32)
INTERFACE INTERFACE
${libs_loc}/openal-soft/build/$<IF:$<CONFIG:Debug>,Debug,RelWithDebInfo>/OpenAL32.lib ${libs_loc}/openal-soft/build/$<IF:$<CONFIG:Debug>,Debug,RelWithDebInfo>/OpenAL32.lib
) )
elseif(APPLE) elseif (APPLE)
target_include_directories(external_openal SYSTEM target_include_directories(external_openal SYSTEM
INTERFACE INTERFACE
/usr/local/macos/include ${libs_loc}/local/include
/usr/local/macos/include/AL ${libs_loc}/local/include/AL
) )
target_link_libraries(external_openal target_link_libraries(external_openal
INTERFACE INTERFACE
/usr/local/macos/lib/libopenal.a ${libs_loc}/local/lib/libopenal.a
) )
else() else()
target_include_directories(external_openal SYSTEM target_include_directories(external_openal SYSTEM

8
external/openssl/CMakeLists.txt vendored
View file

@ -9,15 +9,11 @@ add_library(desktop-app::external_openssl ALIAS external_openssl)
if (WIN32) if (WIN32)
set(openssl_lib_ext lib) set(openssl_lib_ext lib)
if (build_win64) set(openssl_lib_loc ${libs_loc}/openssl/out)
set(openssl_lib_loc ${libs_loc}/openssl_1_1_1/out64)
else()
set(openssl_lib_loc ${libs_loc}/openssl_1_1_1/out32)
endif()
else() else()
set(openssl_lib_ext a) set(openssl_lib_ext a)
if (APPLE) if (APPLE)
set(openssl_lib_loc ${libs_loc}/openssl_1_1_1) set(openssl_lib_loc ${libs_loc}/openssl)
else() else()
set(openssl_lib_loc /usr/local/desktop-app/openssl-1.1.1/lib) set(openssl_lib_loc /usr/local/desktop-app/openssl-1.1.1/lib)
endif() endif()

2
external/openssl/openssl_common/CMakeLists.txt vendored
View file

@ -16,7 +16,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
else() else()
target_include_directories(external_openssl_common SYSTEM target_include_directories(external_openssl_common SYSTEM
INTERFACE INTERFACE
${libs_loc}/openssl_1_1_1/include ${libs_loc}/openssl/include
) )
endif() endif()

4
external/opus/CMakeLists.txt vendored
View file

@ -34,10 +34,10 @@ else()
elseif (APPLE) elseif (APPLE)
target_include_directories(external_opus SYSTEM target_include_directories(external_opus SYSTEM
INTERFACE INTERFACE
/usr/local/macos/include/opus ${libs_loc}/local/include/opus
) )
set_target_properties(external_opus PROPERTIES set_target_properties(external_opus PROPERTIES
IMPORTED_LOCATION /usr/local/macos/lib/libopus.a IMPORTED_LOCATION ${libs_loc}/local/lib/libopus.a
) )
else() else()
target_include_directories(external_opus SYSTEM target_include_directories(external_opus SYSTEM

2
external/qt/package.cmake vendored
View file

@ -9,6 +9,8 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
if (WIN32) if (WIN32)
set(qt_loc ${libs_loc}/Qt-${qt_version}) set(qt_loc ${libs_loc}/Qt-${qt_version})
elseif (APPLE)
set(qt_loc ${libs_loc}/local/Qt-${qt_version})
else() else()
set(qt_loc /usr/local/desktop-app/Qt-${qt_version}) set(qt_loc /usr/local/desktop-app/Qt-${qt_version})
endif() endif()

2
external/zlib/CMakeLists.txt vendored
View file

@ -21,7 +21,7 @@ elseif (WIN32)
set(zlib_lib_loc ${libs_loc}/zlib/contrib/vstudio/vc14/${zlib_config_folder}/ZlibStat$<IF:$<CONFIG:Debug>,Debug,ReleaseWithoutAsm>) set(zlib_lib_loc ${libs_loc}/zlib/contrib/vstudio/vc14/${zlib_config_folder}/ZlibStat$<IF:$<CONFIG:Debug>,Debug,ReleaseWithoutAsm>)
target_link_libraries(external_zlib INTERFACE ${zlib_lib_loc}/zlibstat.lib) target_link_libraries(external_zlib INTERFACE ${zlib_lib_loc}/zlibstat.lib)
elseif (APPLE) elseif (APPLE)
target_link_libraries(external_zlib INTERFACE /usr/local/macos/lib/libz.a) target_link_libraries(external_zlib INTERFACE ${libs_loc}/local/lib/libz.a)
else() else()
target_link_libraries(external_zlib INTERFACE z) target_link_libraries(external_zlib INTERFACE z)
endif() endif()

2
options_mac.cmake
View file

@ -14,7 +14,7 @@ endif()
if (NOT DESKTOP_APP_USE_PACKAGED) if (NOT DESKTOP_APP_USE_PACKAGED)
target_include_directories(common_options SYSTEM target_include_directories(common_options SYSTEM
INTERFACE INTERFACE
/usr/local/macos/include ${libs_loc}/local/include
) )
endif() endif()

4
variables.cmake
View file

@ -84,8 +84,6 @@ endif()
if (build_win64) if (build_win64)
get_filename_component(libs_loc "../Libraries/win64" REALPATH) get_filename_component(libs_loc "../Libraries/win64" REALPATH)
elseif (NOT APPLE)
get_filename_component(libs_loc "../Libraries" REALPATH)
else() else()
get_filename_component(libs_loc "../Libraries/macos" REALPATH) get_filename_component(libs_loc "../Libraries" REALPATH)
endif() endif()