From c502388d1548494e882aff59049090d9ffd1dc3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Florczak?= Date: Wed, 5 Mar 2025 12:23:47 +0100 Subject: [PATCH] Set static libdir for libjpeg-turbo Some distributions like Fedora or Arch use lib64 instead of lib for the libs. That prevented the `LIB_PATH` from pointing at the correct file, and as a result the linking failed on those systems. --- extern/CMakeProject-libjpeg-turbo.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/extern/CMakeProject-libjpeg-turbo.cmake b/extern/CMakeProject-libjpeg-turbo.cmake index ad9aa0fd6d..c3f6160533 100644 --- a/extern/CMakeProject-libjpeg-turbo.cmake +++ b/extern/CMakeProject-libjpeg-turbo.cmake @@ -1,10 +1,11 @@ set(INSTALL_DIR ${CMAKE_BINARY_DIR}/libjpeg-turbo-install) set(INCLUDE_DIR ${INSTALL_DIR}/include) +set(LIB_DIR ${INSTALL_DIR}/lib) if(WIN32) - set(LIB_PATH ${INSTALL_DIR}/lib/turbojpeg-static.lib) + set(LIB_PATH ${LIB_DIR}/turbojpeg-static.lib) else() - set(LIB_PATH ${INSTALL_DIR}/lib/libturbojpeg.a) + set(LIB_PATH ${LIB_DIR}/libturbojpeg.a) endif() if(MACOSX) @@ -18,6 +19,7 @@ ExternalProject_Add( SOURCE_DIR ${SM_EXTERN_DIR}/libjpeg-turbo INSTALL_DIR ${INSTALL_DIR} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} + -DCMAKE_INSTALL_LIBDIR=${LIB_DIR} -DENABLE_SHARED=OFF -DENABLE_STATIC=ON ${ARCH_FLAGS}