Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
ParaView-Superbuild
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
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
Nick Leaf
ParaView-Superbuild
Commits
0486bdbd
Commit
0486bdbd
authored
6 years ago
by
Chuck Atkins
Browse files
Options
Downloads
Patches
Plain Diff
paraview: Apply upstream !2869 if using the 5.6.0 release tarball
parent
8b12c5db
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
projects/paraview.cmake
+5
-0
5 additions, 0 deletions
projects/paraview.cmake
projects/patches/paraview-fix-catalyst-adapter-deps.cmake
+33
-0
33 additions, 0 deletions
projects/patches/paraview-fix-catalyst-adapter-deps.cmake
with
38 additions
and
0 deletions
projects/paraview.cmake
+
5
−
0
View file @
0486bdbd
...
...
@@ -253,6 +253,11 @@ if (paraview_SOURCE_SELECTION STREQUAL "5.5.0")
"Fix issue with building VTK's mpi4py"
)
endif
()
if
(
paraview_SOURCE_SELECTION STREQUAL
"5.6.0"
)
superbuild_apply_patch
(
paraview fix-catalyst-adapter-deps
"Fix issue with catalyst adapters and dependency search"
)
endif
()
if
(
WIN32 AND las_enabled
)
superbuild_append_flags
(
cxx_flags
"-DBOOST_ALL_NO_LIB"
PROJECT_ONLY
)
endif
()
...
...
This diff is collapsed.
Click to expand it.
projects/patches/paraview-fix-catalyst-adapter-deps.cmake
0 → 100644
+
33
−
0
View file @
0486bdbd
commit 561f6f534804a9b088b293feb847857c7c551b5a
Author: Robert Maynard <robert.maynard@kitware.com>
Date: Tue Nov 20 16:53:14 2018 -0500
ParaView propagates CMAKE_PREFIX_PATH to Catalyst Adaptors.
Fixes
#18224
ParaView uses add_custom_command to build all the catalyst adaptors.
This means that any package find calls that occur when including
ParaView's Config Module need to be part of the search path for
the adaptor.
The easiest way is to make sure that CMAKE_PREFIX_PATH is propagated
through add_custom_command as it is the most common way of specifying
where to search.
Note: That as more projects move over to import targets this approach
will continue to fail especially if they specify the search directories
using `<Package>_ROOT`. Long term the catalyst adaptors will need to
become an external project or stop using add_custom_command.
diff --git a/CoProcessing/Adaptors/BuildAdaptors.cmake b/CoProcessing/Adaptors/BuildAdaptors.cmake
index 82ddbe95af..9291893398 100644
--- a/CoProcessing/Adaptors/BuildAdaptors.cmake
+++ b/CoProcessing/Adaptors/BuildAdaptors.cmake
@@ -70,6 +70,7 @@
function
(
build_adaptor name languages
)
-DCMAKE_CXX_FLAGS:STRING=
${
CMAKE_CXX_FLAGS
}
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=
${
CMAKE_LIBRARY_OUTPUT_DIRECTORY
}
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=
${
CMAKE_RUNTIME_OUTPUT_DIRECTORY
}
+ -DCMAKE_PREFIX_PATH:STRING=
${
CMAKE_PREFIX_PATH
}
${
language_options
}
${
extra_params
}
--no-warn-unused-cli
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