diff options
| author | Tsukasa Sugiura <t.sugiura0204@gmail.com> | 2017-07-29 17:48:14 +0900 |
|---|---|---|
| committer | Tsukasa Sugiura <t.sugiura0204@gmail.com> | 2017-07-29 17:48:14 +0900 |
| commit | 1abfae8a3defdc2573ae9f1cd569d4c750ec2dbe (patch) | |
| tree | 0792b04708ae7d11a156b092b8f769d28ac1f36f | |
| parent | e4cab1750a110fcebf5d21c99d9db888f34c0656 (diff) | |
| download | vcpkg-1abfae8a3defdc2573ae9f1cd569d4c750ec2dbe.tar.gz vcpkg-1abfae8a3defdc2573ae9f1cd569d4c750ec2dbe.zip | |
Fix link the dependency libraries in debug configuration
Fix link the dependency libraries in debug configuration.
This commit will fixed a problem that linking dependency libraries of
release version in debug configuration.
| -rw-r--r-- | ports/vtk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/vtk/disable-workaround-findhdf5.patch | 23 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 1 |
3 files changed, 25 insertions, 1 deletions
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index dc00025bf..2b273560a 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,4 +1,4 @@ Source: vtk -Version: 7.1.1 +Version: 7.1.1-1 Description: Software system for 3D computer graphics, image processing, and visualization Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, qt5, msmpi diff --git a/ports/vtk/disable-workaround-findhdf5.patch b/ports/vtk/disable-workaround-findhdf5.patch new file mode 100644 index 000000000..c896af2f5 --- /dev/null +++ b/ports/vtk/disable-workaround-findhdf5.patch @@ -0,0 +1,23 @@ +diff --git a/CMake/vtkModuleMacros.cmake b/CMake/vtkModuleMacros.cmake +index fdd83ed8fc..4986582a5b 100644 +--- a/CMake/vtkModuleMacros.cmake ++++ b/CMake/vtkModuleMacros.cmake +@@ -885,18 +885,6 @@ macro(vtk_module_third_party _pkg) + set(vtk${_lower}_DEFINITIONS ${${_upper}_DEFINITIONS}) + endif() + +- #a workaround for bad FindHDF5 behavior in which deb or opt can +- #end up empty. cmake >= 2.8.12.2 makes this uneccessary +- string(REGEX MATCH "debug;.*optimized;.*" +- _remove_deb_opt "${vtk${_lower}_LIBRARIES}") +- if (_remove_deb_opt) +- set(_tmp ${vtk${_lower}_LIBRARIES}) +- list(REMOVE_ITEM _tmp "debug") +- list(REMOVE_ITEM _tmp "optimized") +- list(REMOVE_DUPLICATES _tmp) +- set(vtk${_lower}_LIBRARIES ${_tmp}) +- endif() +- + set(vtk${_lower}_INCLUDE_DIRS "") + else() + if(_nolibs) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 16854513b..269e6cc79 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_apply_patches( ${CMAKE_CURRENT_LIST_DIR}/netcdf-use-hdf5-definitions.patch ${CMAKE_CURRENT_LIST_DIR}/dont-define-ssize_t.patch ${CMAKE_CURRENT_LIST_DIR}/fix-findhdf5-shared.patch + ${CMAKE_CURRENT_LIST_DIR}/disable-workaround-findhdf5.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) |