kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Ensure libjpeg is linked in the right order

Browse source
This commit is contained in:
Ilya Fedin 2022-03-21 13:08:52 +04:00 • committed by John Preston
parent 250a405b07
commit 77f023b65d
4 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
external/jpeg/CMakeLists.txt vendored
View file

@ -4,17 +4,32 @@
# For license and copyright information please follow this link: # For license and copyright information please follow this link:
# https://github.com/desktop-app/legal/blob/master/LEGAL # https://github.com/desktop-app/legal/blob/master/LEGAL
add_library(external_jpeg INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_jpeg ALIAS external_jpeg)
if (DESKTOP_APP_USE_PACKAGED) if (DESKTOP_APP_USE_PACKAGED)
add_library(external_jpeg INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_jpeg ALIAS external_jpeg)
find_package(JPEG REQUIRED) find_package(JPEG REQUIRED)
target_link_libraries(external_jpeg INTERFACE JPEG::JPEG) target_link_libraries(external_jpeg INTERFACE JPEG::JPEG)
elseif (WIN32) return()
target_include_directories(external_jpeg SYSTEM INTERFACE ${libs_loc}/mozjpeg) endif()
target_link_libraries(external_jpeg INTERFACE ${libs_loc}/mozjpeg/$<IF:$<CONFIG:Debug>,Debug,Release>/jpeg-static.lib)
elseif (APPLE) add_library(external_jpeg STATIC IMPORTED GLOBAL)
target_link_libraries(external_jpeg INTERFACE ${libs_loc}/local/lib/libjpeg.a) add_library(desktop-app::external_jpeg ALIAS external_jpeg)
else()
target_link_static_libraries(external_jpeg INTERFACE jpeg) elseif (WIN32)
set(jpeg_lib_loc ${libs_loc}/mozjpeg)
target_include_directories(external_jpeg SYSTEM INTERFACE ${jpeg_lib_loc})
set_target_properties(external_jpeg PROPERTIES
IMPORTED_LOCATION "${jpeg_lib_loc}/Release/jpeg-static.lib"
IMPORTED_LOCATION_DEBUG "${jpeg_lib_loc}/Debug/jpeg-static.lib"
)
elseif (APPLE)
set_target_properties(external_jpeg PROPERTIES
IMPORTED_LOCATION ${libs_loc}/local/lib/libjpeg.a
)
else()
find_library(JPEG_LIBRARY libjpeg.a REQUIRED)
set_target_properties(external_jpeg PROPERTIES
IMPORTED_LOCATION "${JPEG_LIBRARY}"
)
endif() endif()

1
external/qt/CMakeLists.txt vendored
View file

@ -263,6 +263,7 @@ INTERFACE
$<TARGET_FILE:desktop-app::external_openssl_ssl> $<TARGET_FILE:desktop-app::external_openssl_ssl>
$<TARGET_FILE:desktop-app::external_openssl_crypto> $<TARGET_FILE:desktop-app::external_openssl_crypto>
$<LINK_ONLY:desktop-app::external_jpeg> $<LINK_ONLY:desktop-app::external_jpeg>
$<TARGET_FILE:desktop-app::external_jpeg>
$<LINK_ONLY:desktop-app::external_zlib> $<LINK_ONLY:desktop-app::external_zlib>
$<TARGET_FILE:desktop-app::external_zlib> $<TARGET_FILE:desktop-app::external_zlib>
) )

1
external/qt/qt6/CMakeLists.txt vendored
View file

@ -238,6 +238,7 @@ INTERFACE
$<TARGET_FILE:desktop-app::external_openssl_ssl> $<TARGET_FILE:desktop-app::external_openssl_ssl>
$<TARGET_FILE:desktop-app::external_openssl_crypto> $<TARGET_FILE:desktop-app::external_openssl_crypto>
$<LINK_ONLY:desktop-app::external_jpeg> $<LINK_ONLY:desktop-app::external_jpeg>
$<TARGET_FILE:desktop-app::external_jpeg>
$<LINK_ONLY:desktop-app::external_zlib> $<LINK_ONLY:desktop-app::external_zlib>
$<TARGET_FILE:desktop-app::external_zlib> $<TARGET_FILE:desktop-app::external_zlib>
) )

1
external/webrtc/CMakeLists.txt vendored
View file

@ -89,6 +89,7 @@ INTERFACE
${webrtc_libs_list} ${webrtc_libs_list}
$<LINK_ONLY:desktop-app::external_openssl> $<LINK_ONLY:desktop-app::external_openssl>
$<LINK_ONLY:desktop-app::external_jpeg> $<LINK_ONLY:desktop-app::external_jpeg>
$<TARGET_FILE:desktop-app::external_jpeg>
$<LINK_ONLY:desktop-app::external_opus> $<LINK_ONLY:desktop-app::external_opus>
$<TARGET_FILE:desktop-app::external_opus> $<TARGET_FILE:desktop-app::external_opus>
$<LINK_ONLY:desktop-app::external_vpx> $<LINK_ONLY:desktop-app::external_vpx>