Commit f452ee0d authored by David Thompson's avatar David Thompson Committed by Kitware Robot

Merge topic 'various-fixes'

37f9f8b1 Force MOAB to build w/ NetCDF support as intended.
0fc31c13 Fix VXL build against jpeglib 9b (macOS 10.11).
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !371
parents 169e271d 37f9f8b1
Pipeline #78646 failed with stage
in 0 seconds
......@@ -11,5 +11,6 @@ superbuild_add_project(moab
-DMOAB_USE_HDF:BOOL=ON
-DENABLE_HDF5:BOOL=ON # also required to get hdf5 support enabled
-DMOAB_USE_NETCDF:BOOL=ON
-DENABLE_NETCDF:BOOL=ON # also required to get ncdf/exodus enabled
-DNETCDF_ROOT:PATH=<INSTALL_DIR>
-DMOAB_ENABLE_TESTING:BOOL=ON) # build can't handle this being disabled
diff -U 5 -r old/core/vil/file_formats/vil_jpeg_compressor.cxx src/core/vil/file_formats/vil_jpeg_compressor.cxx
--- old/core/vil/file_formats/vil_jpeg_compressor.cxx 2016-06-14 16:11:06.000000000 -0400
+++ src/core/vil/file_formats/vil_jpeg_compressor.cxx 2017-10-25 16:58:39.000000000 -0400
@@ -69,11 +69,11 @@
jpeg_set_defaults(&jobj);
jpeg_set_quality(&jobj, quality, TRUE);
// start compression
- bool write_all_tables = true;
+ jpeg_boolean write_all_tables = TRUE;
jpeg_start_compress (&jobj, write_all_tables);
//
ready = true;
}
diff -U 5 -r old/core/vil1/file_formats/vil1_jpeg_compressor.cxx src/core/vil1/file_formats/vil1_jpeg_compressor.cxx
--- old/core/vil1/file_formats/vil1_jpeg_compressor.cxx 2016-06-14 16:11:06.000000000 -0400
+++ src/core/vil1/file_formats/vil1_jpeg_compressor.cxx 2017-10-25 17:01:00.000000000 -0400
@@ -52,11 +52,11 @@
}
jpeg_set_defaults(&jobj);
// start compression
- bool write_all_tables = true;
+ jpeg_boolean write_all_tables = TRUE;
jpeg_start_compress (&jobj, write_all_tables);
//
ready = true;
}
......@@ -41,6 +41,8 @@ superbuild_apply_patch(vxl unused-args-release
"Fix unused argument warnings in headers")
superbuild_apply_patch(vxl support-gcc7
"Support detecting GCC7")
superbuild_apply_patch(vxl bad-boolean
"Implicit conversion to jpeg_boolean not always available")
superbuild_add_extra_cmake_args(
-DVXL_DIR:PATH=<INSTALL_DIR>/share/vxl/cmake)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment