actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Set static libdir for libjpeg-turbo

Browse Source 
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.
This commit is contained in:
Rafał Florczak
2025-03-05 08:07:45 -08:00
committed by teejusb
parent ffa4f69597
commit c502388d15
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extern/CMakeProject-libjpeg-turbo.cmake
Vendored
+4 -2
View File
@@ -1,10 +1,11 @@
set(INSTALL_DIR ${CMAKE_BINARY_DIR}/libjpeg-turbo-install) set(INSTALL_DIR ${CMAKE_BINARY_DIR}/libjpeg-turbo-install)
set(INCLUDE_DIR ${INSTALL_DIR}/include) set(INCLUDE_DIR ${INSTALL_DIR}/include)
set(LIB_DIR ${INSTALL_DIR}/lib)
if(WIN32) if(WIN32)
set(LIB_PATH ${INSTALL_DIR}/lib/turbojpeg-static.lib) set(LIB_PATH ${LIB_DIR}/turbojpeg-static.lib)
else() else()
set(LIB_PATH ${INSTALL_DIR}/lib/libturbojpeg.a) set(LIB_PATH ${LIB_DIR}/libturbojpeg.a)
endif() endif()
if(MACOSX) if(MACOSX)
@@ -18,6 +19,7 @@ ExternalProject_Add(
SOURCE_DIR ${SM_EXTERN_DIR}/libjpeg-turbo SOURCE_DIR ${SM_EXTERN_DIR}/libjpeg-turbo
INSTALL_DIR ${INSTALL_DIR} INSTALL_DIR ${INSTALL_DIR}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
-DCMAKE_INSTALL_LIBDIR=${LIB_DIR}
-DENABLE_SHARED=OFF -DENABLE_SHARED=OFF
-DENABLE_STATIC=ON -DENABLE_STATIC=ON
${ARCH_FLAGS} ${ARCH_FLAGS}