[vtk7] 01/01: refresh patches
Gert Wollny
gewo at moszumanska.debian.org
Tue May 16 10:39:19 UTC 2017
This is an automated email from the git hooks/post-receive script.
gewo pushed a commit to branch master
in repository vtk7.
commit ff85f3249abfee06e732de26e682e923b357d824
Author: Gert Wollny <gewo at debian.org>
Date: Tue May 16 10:37:30 2017 +0000
refresh patches
---
debian/patches/100_javac-heap.patch | 8 ++---
debian/patches/101_java_install_path.patch | 8 ++---
...06_install_doxygen_scripts_in_nodoc_build.patch | 2 +-
debian/patches/10_allpatches.patch | 8 ++---
debian/patches/20_soversion-sharedlib.patch | 16 ++++-----
debian/patches/30_matplotlib.patch | 16 ++++-----
debian/patches/70_fix_ftbfs_gcc49.patch | 40 ++++++++++------------
debian/patches/85_hdf5_1_10.patch | 12 +++----
debian/patches/90_xdmf3_install.patch | 26 +++++++-------
debian/patches/95_xdmf3_version.patch | 22 +++++-------
10 files changed, 66 insertions(+), 92 deletions(-)
diff --git a/debian/patches/100_javac-heap.patch b/debian/patches/100_javac-heap.patch
index 46e2e09..f8fa1e3 100644
--- a/debian/patches/100_javac-heap.patch
+++ b/debian/patches/100_javac-heap.patch
@@ -4,11 +4,9 @@ Acked-By: Anton Gladky <gladk at debian.org>
Last-Update: 2016-02-12
Bug: https://gitlab.kitware.com/vtk/vtk/issues/17025
-Index: VTK-6.3.0/Wrapping/Java/CMakeLists.txt
-===================================================================
---- VTK-6.3.0.orig/Wrapping/Java/CMakeLists.txt
-+++ VTK-6.3.0/Wrapping/Java/CMakeLists.txt
-@@ -80,6 +80,8 @@ if(APPLE)
+--- a/Wrapping/Java/CMakeLists.txt
++++ b/Wrapping/Java/CMakeLists.txt
+@@ -80,6 +80,8 @@
set(JAVAC_OPTIONS -J-Xmx512m)
endif()
diff --git a/debian/patches/101_java_install_path.patch b/debian/patches/101_java_install_path.patch
index 18af20a..5da0e36 100644
--- a/debian/patches/101_java_install_path.patch
+++ b/debian/patches/101_java_install_path.patch
@@ -6,11 +6,9 @@ Description: Install Java modules in the correct path
Author: Gert Wollny <gw.fossdev at gmail.com
Last-Update: 2016-03-26
-Index: VTK-6.3.0/CMake/vtkJavaWrapping.cmake
-===================================================================
---- VTK-6.3.0.orig/CMake/vtkJavaWrapping.cmake
-+++ VTK-6.3.0/CMake/vtkJavaWrapping.cmake
-@@ -79,7 +79,7 @@ function(vtk_add_java_wrapping module_na
+--- a/CMake/vtkJavaWrapping.cmake
++++ b/CMake/vtkJavaWrapping.cmake
+@@ -79,7 +79,7 @@
install(TARGETS ${module_name}Java
EXPORT ${VTK_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${VTK_INSTALL_RUNTIME_DIR} COMPONENT RuntimeLibraries
diff --git a/debian/patches/106_install_doxygen_scripts_in_nodoc_build.patch b/debian/patches/106_install_doxygen_scripts_in_nodoc_build.patch
index 0305d4f..d424c97 100644
--- a/debian/patches/106_install_doxygen_scripts_in_nodoc_build.patch
+++ b/debian/patches/106_install_doxygen_scripts_in_nodoc_build.patch
@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -546,9 +546,7 @@
+@@ -540,9 +540,7 @@
# The doxygen documentation needs to be aware of all modules.
option(BUILD_DOCUMENTATION "Build the VTK documentation" OFF)
diff --git a/debian/patches/10_allpatches.patch b/debian/patches/10_allpatches.patch
index 788f74c..e6d02b5 100644
--- a/debian/patches/10_allpatches.patch
+++ b/debian/patches/10_allpatches.patch
@@ -30,11 +30,9 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
-Index: VTK-6.2.0/Wrapping/Tcl/vtkTkAppInit.cxx
-===================================================================
---- VTK-6.2.0.orig/Wrapping/Tcl/vtkTkAppInit.cxx
-+++ VTK-6.2.0/Wrapping/Tcl/vtkTkAppInit.cxx
-@@ -165,6 +165,8 @@ int Tcl_AppInit(Tcl_Interp *interp)
+--- a/Wrapping/Tcl/vtkTkAppInit.cxx
++++ b/Wrapping/Tcl/vtkTkAppInit.cxx
+@@ -165,6 +165,8 @@
// Help Tcl find the Tcl/Tk helper files.
const char* relative_dirs[] =
{
diff --git a/debian/patches/20_soversion-sharedlib.patch b/debian/patches/20_soversion-sharedlib.patch
index f30bc62..63a1cd0 100644
--- a/debian/patches/20_soversion-sharedlib.patch
+++ b/debian/patches/20_soversion-sharedlib.patch
@@ -1,10 +1,8 @@
Forwarded: https://gitlab.kitware.com/vtk/vtk/merge_requests/2701
-Index: VTK-6.3.0/CMake/vtkModuleMacros.cmake
-===================================================================
---- VTK-6.3.0.orig/CMake/vtkModuleMacros.cmake
-+++ VTK-6.3.0/CMake/vtkModuleMacros.cmake
-@@ -401,8 +401,8 @@ endfunction()
+--- a/CMake/vtkModuleMacros.cmake
++++ b/CMake/vtkModuleMacros.cmake
+@@ -417,8 +417,8 @@
function(vtk_target_name _name)
get_property(_type TARGET ${_name} PROPERTY TYPE)
if(NOT "${_type}" STREQUAL EXECUTABLE AND NOT VTK_JAVA_INSTALL)
@@ -15,11 +13,9 @@ Index: VTK-6.3.0/CMake/vtkModuleMacros.cmake
endif()
if("${_name}" MATCHES "^[Vv][Tt][Kk]")
set(_vtk "")
-Index: VTK-6.3.0/Rendering/Tk/CMakeLists.txt
-===================================================================
---- VTK-6.3.0.orig/Rendering/Tk/CMakeLists.txt
-+++ VTK-6.3.0/Rendering/Tk/CMakeLists.txt
-@@ -122,7 +122,7 @@ if(TK_FOUND AND VTK_USE_TK)
+--- a/Rendering/Tk/CMakeLists.txt
++++ b/Rendering/Tk/CMakeLists.txt
+@@ -118,7 +118,7 @@
vtk_target_install(vtkRenderingPythonTkWidgets)
set_property(TARGET vtkRenderingPythonTkWidgets PROPERTY OUTPUT_NAME
diff --git a/debian/patches/30_matplotlib.patch b/debian/patches/30_matplotlib.patch
index cac3abd..6888f1c 100644
--- a/debian/patches/30_matplotlib.patch
+++ b/debian/patches/30_matplotlib.patch
@@ -1,15 +1,13 @@
-Index: VTK-6.3.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-===================================================================
---- VTK-6.3.0.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-+++ VTK-6.3.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-@@ -143,6 +143,10 @@ private:
- // is called internally when matplotlib rendering is first needed and is used
- // to implement IsAvailable.
+--- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
++++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
+@@ -156,6 +156,10 @@
+ * to implement IsAvailable.
+ */
static Availability CheckMPLAvailability();
+ static void DisableMPL()
+ {
+ MPLMathTextAvailable = UNAVAILABLE;
+ };
- // Description:
- // Cache the availability of matplotlib in the current python session.
+ //@{
+ /**
diff --git a/debian/patches/70_fix_ftbfs_gcc49.patch b/debian/patches/70_fix_ftbfs_gcc49.patch
index 441dff2..16fbec2 100644
--- a/debian/patches/70_fix_ftbfs_gcc49.patch
+++ b/debian/patches/70_fix_ftbfs_gcc49.patch
@@ -4,11 +4,9 @@ Bug-Debian: http://bugs.debian.org/746923
Forwarded: https://gitlab.kitware.com/vtk/vtk/merge_requests/2700<Paste>
Last-Update: 2014-05-30
-Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-===================================================================
---- VTK-6.3.0.orig/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-+++ VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-@@ -1112,7 +1112,10 @@ vtkDataSet *vtkDistributedDataFilter::Te
+--- a/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
++++ b/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+@@ -1113,7 +1113,10 @@
vtkIdType cellsPerNode = numTotalCells / nprocs;
vtkIdList **sendCells = new vtkIdList * [ nprocs ];
@@ -19,8 +17,8 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+ }
if (numConsumers == nprocs - 1)
- {
-@@ -1597,7 +1600,9 @@ vtkFloatArray **
+ {
+@@ -1598,7 +1601,9 @@
// Exchange int arrays
float **recvArrays = new float * [nprocs];
@@ -30,8 +28,8 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+ }
if (sendSize[me] > 0) // sent myself an array
- {
-@@ -1719,7 +1724,9 @@ vtkIdTypeArray **
+ {
+@@ -1720,7 +1725,9 @@
// Exchange int arrays
vtkIdType **recvArrays = new vtkIdType * [nprocs];
@@ -41,8 +39,8 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+ }
if (sendSize[me] > 0) // sent myself an array
- {
-@@ -2788,7 +2795,9 @@ void vtkDistributedDataFilter::AddConsta
+ {
+@@ -2789,7 +2796,9 @@
unsigned char *vals = new unsigned char [npoints];
@@ -53,7 +51,7 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
Array->SetName(arrayName);
-@@ -2808,7 +2817,9 @@ void vtkDistributedDataFilter::AddConsta
+@@ -2809,7 +2818,9 @@
unsigned char *vals = new unsigned char [ncells];
@@ -64,7 +62,7 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
Array->SetName(arrayName);
-@@ -3007,7 +3018,9 @@ int vtkDistributedDataFilter::AssignGlob
+@@ -3008,7 +3019,9 @@
vtkIdType nGridPoints = grid->GetNumberOfPoints();
vtkIdType *numPointsOutside = new vtkIdType [nprocs];
@@ -75,7 +73,7 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
vtkIdTypeArray *globalIds = vtkIdTypeArray::New();
globalIds->SetNumberOfValues(nGridPoints);
-@@ -3089,10 +3102,16 @@ int vtkDistributedDataFilter::AssignGlob
+@@ -3090,10 +3103,16 @@
// global ID back?
vtkFloatArray **ptarrayOut = new vtkFloatArray * [nprocs];
@@ -94,8 +92,8 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
vtkIdType *next = new vtkIdType [nprocs];
vtkIdType *next3 = new vtkIdType [nprocs];
-@@ -3267,7 +3286,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
- {
+@@ -3268,7 +3287,9 @@
+ {
// There are no cells in my assigned region
- memset(gids, 0, sizeof(vtkIdTypeArray *) * nprocs);
@@ -104,8 +102,8 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+ }
return gids;
- }
-@@ -3472,7 +3493,10 @@ vtkIdTypeArray **vtkDistributedDataFilte
+ }
+@@ -3473,7 +3494,10 @@
std::multimap<int, int>::iterator mapIt;
vtkIdTypeArray **processList = new vtkIdTypeArray * [nprocs];
@@ -116,8 +114,8 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+ }
for (int i=0; i<nprocs; i++)
- {
-@@ -3562,7 +3586,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
+ {
+@@ -3563,7 +3587,9 @@
vtkIdType numPoints = grid->GetNumberOfPoints();
vtkIdTypeArray **ghostPtIds = new vtkIdTypeArray * [nprocs];
@@ -127,4 +125,4 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+ }
if (numPoints < 1)
- {
+ {
diff --git a/debian/patches/85_hdf5_1_10.patch b/debian/patches/85_hdf5_1_10.patch
index 90ee578..50057e9 100644
--- a/debian/patches/85_hdf5_1_10.patch
+++ b/debian/patches/85_hdf5_1_10.patch
@@ -2,11 +2,9 @@ Description: Fix compilation errors when building with HDF5 1.10.0
Author: Steven Hahn <hahnse at ornl.gov>
Bug: https://gitlab.kitware.com/vtk/vtk/commit/6541e9c7662d3987baded0ea90de80937fa23d7a
-diff --git a/ThirdParty/netcdf/vtknetcdf/libsrc4/nc4internal.h b/ThirdParty/netcdf/vtknetcdf/libsrc4/nc4internal.h
-index 628d0c964f..e023f38310 100644
--- a/ThirdParty/netcdf/vtknetcdf/libsrc4/nc4internal.h
+++ b/ThirdParty/netcdf/vtknetcdf/libsrc4/nc4internal.h
-@@ -367,7 +367,7 @@ NC_FILE_INFO_T *nc4_find_nc_file(int ncid);
+@@ -367,7 +367,7 @@
int nc4_find_dim(NC_GRP_INFO_T *grp, int dimid, NC_DIM_INFO_T **dim, NC_GRP_INFO_T **dim_grp);
int nc4_find_dim_len(NC_GRP_INFO_T *grp, int dimid, size_t **len);
int nc4_find_type(NC_HDF5_FILE_INFO_T *h5, int typeid, NC_TYPE_INFO_T **type);
@@ -15,11 +13,9 @@ index 628d0c964f..e023f38310 100644
NC_TYPE_INFO_T *nc4_rec_find_hdf_type(NC_GRP_INFO_T *start_grp, hid_t target_hdf_typeid);
NC_TYPE_INFO_T *nc4_rec_find_named_type(NC_GRP_INFO_T *start_grp, char *name);
NC_TYPE_INFO_T *nc4_rec_find_equal_type(NC_GRP_INFO_T *start_grp, int ncid1, NC_TYPE_INFO_T *type);
-diff --git a/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx b/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx
-index 48a775357c..5db2620a32 100644
--- a/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx
+++ b/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfH5Driver.cxx
-@@ -139,7 +139,11 @@ static int H5FD_dsm_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
+@@ -139,7 +139,11 @@
#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8))
static haddr_t H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
@@ -31,7 +27,7 @@ index 48a775357c..5db2620a32 100644
#else
static haddr_t H5FD_dsm_get_eoa(H5FD_t *_file);
static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr);
-@@ -155,6 +159,9 @@ static const H5FD_class_t H5FD_dsm_g = {
+@@ -155,6 +159,9 @@
"dsm", /*name */
MAXADDR, /*maxaddr */
H5F_CLOSE_WEAK, /*fc_degree */
@@ -41,7 +37,7 @@ index 48a775357c..5db2620a32 100644
NULL, /*sb_size */
NULL, /*sb_encode */
NULL, /*sb_decode */
-@@ -687,7 +694,10 @@ H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr)
+@@ -687,7 +694,10 @@
*-------------------------------------------------------------------------
*/
static haddr_t
diff --git a/debian/patches/90_xdmf3_install.patch b/debian/patches/90_xdmf3_install.patch
index 8393d99..a5f2fdf 100644
--- a/debian/patches/90_xdmf3_install.patch
+++ b/debian/patches/90_xdmf3_install.patch
@@ -2,10 +2,8 @@ Description: Install XDMF3 in the right places
Author: Nico Schlömer <nico.schloemer at gmail.com>
Forwarded: https://gitlab.kitware.com/xdmf/xdmf/merge_requests/29
-diff --git VTK-6.3.0/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt VTK-6.3.0/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt
-index b0be93e7..a8b11c15 100644
---- VTK-6.3.0/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt
-+++ VTK-6.3.0/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt
+--- a/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt
++++ b/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt
@@ -1,5 +1,5 @@
project(Xdmf)
-cmake_minimum_required(VERSION 2.6)
@@ -13,7 +11,7 @@ index b0be93e7..a8b11c15 100644
#Needed to build DSM because relative paths are used to add its libraries
if (POLICY CMP0015)
-@@ -192,9 +192,14 @@ if(XDMF_WRAP_PYTHON)
+@@ -189,9 +189,14 @@
PROPERTIES
OUTPUT_NAME "_${python_name}")
@@ -29,7 +27,7 @@ index b0be93e7..a8b11c15 100644
get_directory_property(${python_name}Parent PARENT_DIRECTORY)
if(NOT "${${python_name}Parent}" STREQUAL "")
set(${python_name_upper}_PYTHON ${${python_name_upper}_PYTHON}
-@@ -202,9 +207,9 @@ if(XDMF_WRAP_PYTHON)
+@@ -199,9 +204,9 @@
endif()
install(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${python_name}.py
@@ -41,7 +39,7 @@ index b0be93e7..a8b11c15 100644
endmacro()
endif()
-@@ -299,6 +304,8 @@ add_subdirectory(core)
+@@ -296,6 +301,8 @@
include_directories(${XdmfCore_INCLUDE_DIRS} ${XdmfDSM_INCLUDE_DIRS})
link_directories(${XDMF_LIBRARY_DIRS})
@@ -50,7 +48,7 @@ index b0be93e7..a8b11c15 100644
option(XDMF_BUILD_CORE_ONLY OFF)
mark_as_advanced(XDMF_BUILD_CORE_ONLY)
if(NOT XDMF_BUILD_CORE_ONLY)
-@@ -371,16 +378,16 @@ if(NOT XDMF_BUILD_CORE_ONLY)
+@@ -368,16 +375,16 @@
set_target_properties(${XDMF_LIBNAME} PROPERTIES
PREFIX ../
IMPORT_PREFIX ../
@@ -73,7 +71,7 @@ index b0be93e7..a8b11c15 100644
endif ()
endif()
endif()
-@@ -399,7 +406,10 @@ if(NOT XDMF_BUILD_CORE_ONLY)
+@@ -396,7 +403,10 @@
else()
XDMF_SWIG_PYTHON(${XDMF_LIBNAME} XdmfCore)
endif()
@@ -85,8 +83,8 @@ index b0be93e7..a8b11c15 100644
endif()
if(XDMF_BUILD_TESTING)
-@@ -417,14 +427,14 @@ if(NOT XDMF_BUILD_CORE_ONLY)
-
+@@ -414,14 +424,14 @@
+
if(UNIX)
if (BUILD_SHARED_LIBS)
- set(XDMF_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/lib${XDMF_LIBNAME}.so)
@@ -101,9 +99,9 @@ index b0be93e7..a8b11c15 100644
- set(XDMF_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/lib${XDMF_LIBNAME}.dylib)
+ set(XDMF_LIBRARY ${CMAKE_INSTALL_LIBDIR}/lib${XDMF_LIBNAME}.dylib)
endif()
-
- file(GLOB XdmfHeaders
-@@ -436,17 +446,23 @@ if(NOT XDMF_BUILD_CORE_ONLY)
+
+ file(GLOB XdmfHeaders
+@@ -433,17 +443,23 @@
)
install(FILES ${XdmfHeaders} DESTINATION include)
install(TARGETS ${XDMF_LIBNAME}
diff --git a/debian/patches/95_xdmf3_version.patch b/debian/patches/95_xdmf3_version.patch
index 60a25de..b3e2243 100644
--- a/debian/patches/95_xdmf3_version.patch
+++ b/debian/patches/95_xdmf3_version.patch
@@ -2,11 +2,9 @@ Description: Set {SO}VERSION on XDMF3 library
Author: Nico Schlömer <nico.schloemer at gmail.com>
Forwarded: https://gitlab.kitware.com/xdmf/xdmf/merge_requests/28
-diff --git a/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt b/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt
-index f6f9c80235..34193d55aa 100644
--- a/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt
+++ b/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt
-@@ -13,6 +13,12 @@ if(MSVC10)
+@@ -13,6 +13,12 @@
endif()
set(XDMF_LIBNAME "Xdmf" CACHE STRING "Name for this xdmf library to avoid collision")
@@ -19,7 +17,7 @@ index f6f9c80235..34193d55aa 100644
option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF)
if(BUILD_SHARED_LIBS)
set(LIBTYPE SHARED)
-@@ -329,17 +335,29 @@ if(NOT XDMF_BUILD_CORE_ONLY)
+@@ -336,17 +342,29 @@
if(XDMF_STATIC_AND_SHARED)
add_library(XdmfObjects OBJECT ${XdmfSources})
@@ -51,7 +49,7 @@ index f6f9c80235..34193d55aa 100644
if(XDMF_BUILD_DSM)
target_link_libraries(${XDMF_LIBNAME} XdmfCore XdmfDSM)
if(XDMF_STATIC_AND_SHARED AND BUILD_SHARED_LIBS)
-@@ -411,7 +429,7 @@ if(NOT XDMF_BUILD_CORE_ONLY)
+@@ -421,7 +439,7 @@
if(WIN32)
set(XDMF_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/${XDMF_LIBNAME}.lib)
endif()
@@ -59,10 +57,10 @@ index f6f9c80235..34193d55aa 100644
+
if(UNIX)
if (BUILD_SHARED_LIBS)
- set(XDMF_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/lib${XDMF_LIBNAME}.so)
-@@ -423,11 +441,11 @@ if(NOT XDMF_BUILD_CORE_ONLY)
+ set(XDMF_LIBRARY ${CMAKE_INSTALL_LIBDIR}/lib${XDMF_LIBNAME}.so)
+@@ -433,11 +451,11 @@
if(APPLE)
- set(XDMF_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/lib${XDMF_LIBNAME}.dylib)
+ set(XDMF_LIBRARY ${CMAKE_INSTALL_LIBDIR}/lib${XDMF_LIBNAME}.dylib)
endif()
-
- file(GLOB XdmfHeaders
@@ -77,11 +75,9 @@ index f6f9c80235..34193d55aa 100644
"CMake/VersionSuite/*.hpp"
"${CMAKE_CURRENT_BINARY_DIR}/*.hpp"
)
-diff --git a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt
-index 38240fc8e2..0025984581 100644
--- a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt
+++ b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt
-@@ -163,17 +163,31 @@ endif()
+@@ -163,17 +163,31 @@
if (XDMF_STATIC_AND_SHARED)
add_library(XdmfCoreObjects OBJECT ${XdmfCoreSources})
@@ -117,11 +113,9 @@ index 38240fc8e2..0025984581 100644
link_directories(${XDMF_LIBRARY_DIRS})
-diff --git a/ThirdParty/xdmf3/vtkxdmf3/core/dsm/CMakeLists.txt b/ThirdParty/xdmf3/vtkxdmf3/core/dsm/CMakeLists.txt
-index 36d0ed6712..bb210d8ceb 100644
--- a/ThirdParty/xdmf3/vtkxdmf3/core/dsm/CMakeLists.txt
+++ b/ThirdParty/xdmf3/vtkxdmf3/core/dsm/CMakeLists.txt
-@@ -90,9 +90,19 @@ if (XDMF_DSM_IS_CRAY)
+@@ -90,9 +90,19 @@
endif (XDMF_DSM_IS_CRAY)
add_library(XdmfDSMObjects OBJECT ${XdmfDSMSources})
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk7.git
More information about the debian-science-commits
mailing list