Commit a00ef388 authored by David E. DeMarle's avatar David E. DeMarle Committed by Code Review

Merge topic '0013597-fix-sys-hdf5' into master

1e2918be BUG 0013597 fix use system hdf5 for all build types
parents b60586fd 1e2918be
......@@ -715,6 +715,19 @@ macro(vtk_module_third_party _pkg)
else()
set(vtk${_lower}_LIBRARIES "${${_upper}_LIBRARIES}")
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)
......
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