mirror of
https://github.com/cemu-project/vcpkg.git
synced 2025-02-23 11:07:10 +01:00
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.
This commit is contained in:
parent
e4cab1750a
commit
1abfae8a3d
@ -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
|
||||
|
23
ports/vtk/disable-workaround-findhdf5.patch
Normal file
23
ports/vtk/disable-workaround-findhdf5.patch
Normal file
@ -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)
|
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user