diff --git a/external/auto_updates/xz/CMakeLists.txt b/external/auto_updates/xz/CMakeLists.txt index 438dd15..8631a5d 100644 --- a/external/auto_updates/xz/CMakeLists.txt +++ b/external/auto_updates/xz/CMakeLists.txt @@ -13,11 +13,11 @@ if (DESKTOP_APP_USE_PACKAGED) elseif (APPLE) target_include_directories(external_xz SYSTEM INTERFACE - /usr/local/macos/include + ${libs_loc}/local/include ) target_link_libraries(external_xz INTERFACE - /usr/local/macos/lib/liblzma.a + ${libs_loc}/local/lib/liblzma.a ) else() target_link_static_libraries(external_xz diff --git a/external/iconv/CMakeLists.txt b/external/iconv/CMakeLists.txt index 36245b1..94434bf 100644 --- a/external/iconv/CMakeLists.txt +++ b/external/iconv/CMakeLists.txt @@ -13,6 +13,6 @@ if (APPLE AND DESKTOP_APP_USE_PACKAGED) elseif (APPLE) target_link_libraries(external_iconv INTERFACE - /usr/local/macos/lib/libiconv.a + ${libs_loc}/local/lib/libiconv.a ) endif() diff --git a/external/jpeg/CMakeLists.txt b/external/jpeg/CMakeLists.txt index 9cb5ff8..5ed56cf 100644 --- a/external/jpeg/CMakeLists.txt +++ b/external/jpeg/CMakeLists.txt @@ -14,7 +14,7 @@ elseif (WIN32) target_include_directories(external_jpeg SYSTEM INTERFACE ${libs_loc}/mozjpeg) target_link_libraries(external_jpeg INTERFACE ${libs_loc}/mozjpeg/$,Debug,Release>/jpeg-static.lib) 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() target_link_static_libraries(external_jpeg INTERFACE jpeg) endif() diff --git a/external/openal/CMakeLists.txt b/external/openal/CMakeLists.txt index 483d905..f97013a 100644 --- a/external/openal/CMakeLists.txt +++ b/external/openal/CMakeLists.txt @@ -27,15 +27,15 @@ elseif (WIN32) INTERFACE ${libs_loc}/openal-soft/build/$,Debug,RelWithDebInfo>/OpenAL32.lib ) -elseif(APPLE) +elseif (APPLE) target_include_directories(external_openal SYSTEM INTERFACE - /usr/local/macos/include - /usr/local/macos/include/AL + ${libs_loc}/local/include + ${libs_loc}/local/include/AL ) target_link_libraries(external_openal INTERFACE - /usr/local/macos/lib/libopenal.a + ${libs_loc}/local/lib/libopenal.a ) else() target_include_directories(external_openal SYSTEM diff --git a/external/openssl/CMakeLists.txt b/external/openssl/CMakeLists.txt index d66b5d8..0e0b9d9 100644 --- a/external/openssl/CMakeLists.txt +++ b/external/openssl/CMakeLists.txt @@ -9,15 +9,11 @@ add_library(desktop-app::external_openssl ALIAS external_openssl) if (WIN32) set(openssl_lib_ext lib) - if (build_win64) - set(openssl_lib_loc ${libs_loc}/openssl_1_1_1/out64) - else() - set(openssl_lib_loc ${libs_loc}/openssl_1_1_1/out32) - endif() + set(openssl_lib_loc ${libs_loc}/openssl/out) else() set(openssl_lib_ext a) if (APPLE) - set(openssl_lib_loc ${libs_loc}/openssl_1_1_1) + set(openssl_lib_loc ${libs_loc}/openssl) else() set(openssl_lib_loc /usr/local/desktop-app/openssl-1.1.1/lib) endif() diff --git a/external/openssl/openssl_common/CMakeLists.txt b/external/openssl/openssl_common/CMakeLists.txt index 3343366..3caa6fb 100644 --- a/external/openssl/openssl_common/CMakeLists.txt +++ b/external/openssl/openssl_common/CMakeLists.txt @@ -16,7 +16,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED) else() target_include_directories(external_openssl_common SYSTEM INTERFACE - ${libs_loc}/openssl_1_1_1/include + ${libs_loc}/openssl/include ) endif() diff --git a/external/opus/CMakeLists.txt b/external/opus/CMakeLists.txt index 4ad35f0..5fd2606 100644 --- a/external/opus/CMakeLists.txt +++ b/external/opus/CMakeLists.txt @@ -34,10 +34,10 @@ else() elseif (APPLE) target_include_directories(external_opus SYSTEM INTERFACE - /usr/local/macos/include/opus + ${libs_loc}/local/include/opus ) set_target_properties(external_opus PROPERTIES - IMPORTED_LOCATION /usr/local/macos/lib/libopus.a + IMPORTED_LOCATION ${libs_loc}/local/lib/libopus.a ) else() target_include_directories(external_opus SYSTEM diff --git a/external/qt/package.cmake b/external/qt/package.cmake index adbc8ed..3169cbe 100644 --- a/external/qt/package.cmake +++ b/external/qt/package.cmake @@ -9,6 +9,8 @@ if (NOT DESKTOP_APP_USE_PACKAGED) if (WIN32) set(qt_loc ${libs_loc}/Qt-${qt_version}) + elseif (APPLE) + set(qt_loc ${libs_loc}/local/Qt-${qt_version}) else() set(qt_loc /usr/local/desktop-app/Qt-${qt_version}) endif() diff --git a/external/zlib/CMakeLists.txt b/external/zlib/CMakeLists.txt index d5b1660..b1bf692 100644 --- a/external/zlib/CMakeLists.txt +++ b/external/zlib/CMakeLists.txt @@ -21,7 +21,7 @@ elseif (WIN32) set(zlib_lib_loc ${libs_loc}/zlib/contrib/vstudio/vc14/${zlib_config_folder}/ZlibStat$,Debug,ReleaseWithoutAsm>) target_link_libraries(external_zlib INTERFACE ${zlib_lib_loc}/zlibstat.lib) 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() target_link_libraries(external_zlib INTERFACE z) endif() diff --git a/options_mac.cmake b/options_mac.cmake index 7f2944e..d4b0543 100644 --- a/options_mac.cmake +++ b/options_mac.cmake @@ -14,7 +14,7 @@ endif() if (NOT DESKTOP_APP_USE_PACKAGED) target_include_directories(common_options SYSTEM INTERFACE - /usr/local/macos/include + ${libs_loc}/local/include ) endif() diff --git a/variables.cmake b/variables.cmake index 5ff5748..08b5bd9 100644 --- a/variables.cmake +++ b/variables.cmake @@ -84,8 +84,6 @@ endif() if (build_win64) get_filename_component(libs_loc "../Libraries/win64" REALPATH) -elseif (NOT APPLE) - get_filename_component(libs_loc "../Libraries" REALPATH) else() - get_filename_component(libs_loc "../Libraries/macos" REALPATH) + get_filename_component(libs_loc "../Libraries" REALPATH) endif()