Skip to content
Snippets Groups Projects
Commit 89f47f95 authored by David E. DeMarle's avatar David E. DeMarle
Browse files

Fix adaptor's cmake search path for 5.6.0 release only

The 5.6.0 version lacks any CMAKE_PREFIX_PATH line, so the patch
has to add it, not modify it like the last attempt tried to do.
The patch is predicated on paraview_SOURCE_SELECTION == 5.6.0 so
it has not effect on master or release, both of which already have
the correct "${CMAKE_... line.
parent 4396c8e4
No related branches found
No related tags found
No related merge requests found
commit 8c4a262e363b4e01868425a6b445acd516e6273c
Author: Paul Ferrell <pferrell@lanl.gov>
Date: Thu, 31 Jan 2019 13:45:56 -0700
The calls to cmake in BuildAdaptors were passing CMAKE_PREFIX_PATH to cmake calls without quoting
it. That worked fine for when CMAKE_PREFIX_PATH wasn't set or was a single item, but when it was a
list it broke the builds of the adaptors.
diff --git a/CoProcessing/Adaptors/BuildAdaptors.cmake b/CoProcessing/Adaptors/BuildAdaptors.cmake
index 9291893..4ff7547 100644
index 82ddbe95af..4ff75472d1 100644
--- a/CoProcessing/Adaptors/BuildAdaptors.cmake
+++ b/CoProcessing/Adaptors/BuildAdaptors.cmake
@@ -70,7 +70,7 @@ function(build_adaptor name languages)
@@ -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}
+ -DCMAKE_PREFIX_PATH:STRING="${CMAKE_PREFIX_PATH}"
${language_options}
${extra_params}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment