Merge pull request #79 from nimble0/fix/turbojpeg-libdir

agruzdev · web-flow · commit bdfee5888f7a · 2026-05-25T20:44:30.000+03:00
Fix wrong turbojpeg library path for some setups.
diff --git a/cmake/dependency.jpeg.cmake b/cmake/dependency.jpeg.cmake
@@ -58,6 +58,7 @@ elseif(JPEG_REPOSITORY STREQUAL "JPEG-turbo")
                     -t "${EXTERNALPROJECT_BINARY_ROOT}/turbojpeg/install/include"
         CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DENABLE_SHARED=OFF" "-DENABLE_STATIC=ON" "-DWITH_JPEG7=ON" "-DWITH_CRT_DLL=ON"
             "-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON" "-DWITH_TOOLS=OFF" "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/turbojpeg/install"
+            "-DCMAKE_INSTALL_DEFAULT_LIBDIR:PATH=lib"
         EXCLUDE_FROM_ALL
     )
 

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ elseif(JPEG_REPOSITORY STREQUAL "JPEG-turbo")`
`58`	`58`	`-t "${EXTERNALPROJECT_BINARY_ROOT}/turbojpeg/install/include"`
`59`	`59`	`CMAKE_ARGS ${CMAKE_TOOLCHAIN_FILE_ARG} ${CMAKE_BUILD_TYPE_ARG} "-DENABLE_SHARED=OFF" "-DENABLE_STATIC=ON" "-DWITH_JPEG7=ON" "-DWITH_CRT_DLL=ON"`
`60`	`60`	`"-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON" "-DWITH_TOOLS=OFF" "-DCMAKE_INSTALL_PREFIX:PATH=${EXTERNALPROJECT_BINARY_ROOT}/turbojpeg/install"`
	`61`	`+ "-DCMAKE_INSTALL_DEFAULT_LIBDIR:PATH=lib"`
`61`	`62`	`EXCLUDE_FROM_ALL`
`62`	`63`	`)`
`63`	`64`