Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VTK
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lin Ma
VTK
Commits
a00ef388
Commit
a00ef388
authored
11 years ago
by
Dave DeMarle
Committed by
Code Review
11 years ago
Browse files
Options
Downloads
Plain Diff
Merge topic '0013597-fix-sys-hdf5' into master
1e2918be
BUG 0013597 fix use system hdf5 for all build types
parents
b60586fd
1e2918be
Branches
Branches containing commit
Tags
v3.25.0
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMake/vtkModuleMacros.cmake
+13
-0
13 additions, 0 deletions
CMake/vtkModuleMacros.cmake
with
13 additions
and
0 deletions
CMake/vtkModuleMacros.cmake
+
13
−
0
View file @
a00ef388
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment