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
e50aa6c4
Commit
e50aa6c4
authored
5 years ago
by
David E. DeMarle
Browse files
Options
Downloads
Patches
Plain Diff
use a bigger hammer to fix adaptor's cmake_prefix_paths
parent
decd5536
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
projects/patches/paraview-fix-catalyst-adapter-deps.patch
+43
-6
43 additions, 6 deletions
projects/patches/paraview-fix-catalyst-adapter-deps.patch
with
43 additions
and
6 deletions
projects/patches/paraview-fix-catalyst-adapter-deps.patch
+
43
−
6
View file @
e50aa6c4
diff --git a/CoProcessing/Adaptors/BuildAdaptors.cmake b/CoProcessing/Adaptors/BuildAdaptors.cmake
diff --git a/CoProcessing/Adaptors/BuildAdaptors.cmake b/CoProcessing/Adaptors/BuildAdaptors.cmake
index 82ddbe9
5af..4ff75472d1
100644
index 82ddbe9
..2337cac
100644
--- a/CoProcessing/Adaptors/BuildAdaptors.cmake
--- a/CoProcessing/Adaptors/BuildAdaptors.cmake
+++ b/CoProcessing/Adaptors/BuildAdaptors.cmake
+++ b/CoProcessing/Adaptors/BuildAdaptors.cmake
@@ -70,6 +70,7 @@
function(build_adaptor name languages)
@@ -51,6 +51,28 @@
function(build_adaptor name languages)
-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
-DCMAKE_${lang}_FLAGS:STRING=${CMAKE_${lang}_FLAGS})
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
endforeach ()
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+ -DCMAKE_PREFIX_PATH:STRING="${CMAKE_PREFIX_PATH}"
+ #This generated file ensures that the adaptor's CMakeCache ends up with
+ #the same CMAKE_PREFIX_PATH that ParaView's does, even if that has multiple
+ #paths in it. It is necessary because ctest's argument parsing in the
+ #custom command below destroys path separators.
+ #Note: the generated file will become stale if these variables change.
+ #In that case it will need manual intervention (remove it) to fix.
+ file(GENERATE
+ OUTPUT "${BINARY_DIR}/${lname}_build_options.cmake"
+ CONTENT
+"
+set(ParaView_DIR ${ParaView_BINARY_DIR} CACHE PATH \"\")
+set(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE} CACHE PATH \"\")
+set(Qt5_DIR ${Qt5_DIR} CACHE PATH \"\")
+set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING \"\")
+set(CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER} CACHE FILEPATH \"\")
+set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING \"\")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} CACHE PATH \"\")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} CACHE PATH \"\")
+set(CMAKE_PREFIX_PATH \"${CMAKE_PREFIX_PATH}\" CACHE STRING \"\")
+"
+)
+
add_custom_command(
OUTPUT "${BINARY_DIR}/${lname}.done"
COMMAND ${CMAKE_CTEST_COMMAND}
@@ -62,14 +84,7 @@
function(build_adaptor name languages)
--build-project ${name}
--build-generator ${CMAKE_GENERATOR}
--build-makeprogram ${CMAKE_MAKE_PROGRAM}
- --build-options -DParaView_DIR:PATH=${ParaView_BINARY_DIR}
- -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
- -DQt5_DIR:PATH=${Qt5_DIR}
- -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
- -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
- -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}
+ --build-options -C "${BINARY_DIR}/${lname}_build_options.cmake"
${language_options}
${language_options}
${extra_params}
${extra_params}
--no-warn-unused-cli
--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