File tree Expand file tree Collapse file tree 2 files changed +23
-13
lines changed
Expand file tree Collapse file tree 2 files changed +23
-13
lines changed Original file line number Diff line number Diff line change 290290 " -i" ,
291291 " $HOME/temp/florence.jp2" ,
292292 " -o" ,
293- " $HOME/temp/florence.jp2.tif " ,
293+ " $HOME/temp/florence.jp2.jpg " ,
294294
295295 ],
296296 "cwd" : " ${workspaceFolder}" ,
Original file line number Diff line number Diff line change @@ -60,18 +60,28 @@ if (GRK_BUILD_JPEG)
6060 ${CMAKE_CURRENT_BINARY_DIR} /../_deps/libjpeg-turbo-build
6161 PARENT_SCOPE)
6262 else ()
63- ExternalProject_Add(libjpeg-turbo
64- CMAKE_ARGS
65- -DENABLE_SHARED=OFF
66- -DENABLE_STATIC=ON
67- -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR} /libjpeg-turbo
68- -DCMAKE_INSTALL_LIBDIR=${CMAKE_CURRENT_BINARY_DIR} /bin
69- -DCMAKE_POSITION_INDEPENDENT_CODE=ON
70- -DWITH_TURBOJPEG=0
71- GIT_REPOSITORY https://github.com/libjpeg-turbo/libjpeg-turbo.git
72- GIT_TAG 3.1.2)
73- set (JPEG_LIBNAME ${CMAKE_CURRENT_BINARY_DIR} /bin/${JPEG_LIBNAME} PARENT_SCOPE)
74- set (JPEG_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} /libjpeg-turbo/include / PARENT_SCOPE)
63+ ExternalProject_Add(libjpeg-turbo
64+ CMAKE_ARGS
65+ -DENABLE_SHARED=OFF
66+ -DENABLE_STATIC=ON
67+ -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR} /libjpeg-turbo
68+ -DCMAKE_INSTALL_LIBDIR=${CMAKE_CURRENT_BINARY_DIR} /bin
69+ -DCMAKE_POSITION_INDEPENDENT_CODE=ON
70+ -DWITH_TURBOJPEG=0
71+ GIT_REPOSITORY https://github.com/libjpeg-turbo/libjpeg-turbo.git
72+ GIT_TAG 3.1.2)
73+
74+ # Create imported target for the static library
75+ add_library (jpeg-imported STATIC IMPORTED GLOBAL )
76+ set_target_properties (jpeg-imported PROPERTIES
77+ IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR} /bin/${JPEG_LIBNAME}
78+ INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR} /libjpeg-turbo/include
79+ )
80+ add_dependencies (jpeg-imported libjpeg-turbo)
81+
82+ # Use the imported target instead of raw lib path
83+ set (JPEG_LIBNAME jpeg-imported PARENT_SCOPE)
84+ set (JPEG_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} /libjpeg-turbo/include / PARENT_SCOPE)
7585endif ()
7686else (GRK_BUILD_JPEG)
7787 find_package (JPEG)
You can’t perform that action at this time.
0 commit comments