Skip to content
Snippets Groups Projects
Commit f7943bc4 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

jpeg: update to the new module system

parent 3067c3f8
No related branches found
No related tags found
No related merge requests found
vtk_module_third_party(JPEG
INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/vtkjpeg)
vtk_module_third_party(
INTERNAL
LICENSE_FILES "vtkjpeg/LICENSE.md"
VERSION "2.0.0"
STANDARD_INCLUDE_DIRS
EXTERNAL
PACKAGE JPEG
TARGETS JPEG::JPEG
STANDARD_INCLUDE_DIRS)
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/vtk_jpeg.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/vtk_jpeg.h")
vtk_module_install_headers(
FILES "${CMAKE_CURRENT_BINARY_DIR}/vtk_jpeg.h")
vtk_module(vtkjpeg EXCLUDE_FROM_WRAPPING)
\ No newline at end of file
......@@ -8,7 +8,7 @@ readonly name="jpeg"
readonly ownership="jpeg-turbo Upstream <kwrobot@kitware.com>"
readonly subtree="ThirdParty/$name/vtk$name"
readonly repo="https://gitlab.kitware.com/third-party/libjpeg-turbo.git"
readonly tag="for/vtk-old"
readonly tag="for/vtk-20181231.1-2.0.0"
readonly paths="
.gitattributes
CMakeLists.vtk.txt
......@@ -19,7 +19,6 @@ vtk_jpeg_mangle.h
jconfig.h.in
jconfigint.h.in
win/jconfig.h.in
win/jconfigint.h.in
LICENSE.md
README.ijg
......
NAME
VTK::jpeg
LIBRARY_NAME
vtkjpeg
THIRD_PARTY
......@@ -16,8 +16,9 @@
#define vtk_jpeg_h
/* Use the jpeg library configured for VTK. */
#cmakedefine VTK_USE_SYSTEM_JPEG
#ifdef VTK_USE_SYSTEM_JPEG
#cmakedefine01 VTK_MODULE_USE_EXTERNAL_vtkjpeg
#if VTK_MODULE_USE_EXTERNAL_vtkjpeg
/* Work-around for a conflict between windows.h and jpeglib.h in cygwin.
If ADDRESS_TAG_BIT is defined then BaseTsd.h has been included and
INT32 has been defined with a typedef, so we must define XMD_H to
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment