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
441506e1
Commit
441506e1
authored
6 years ago
by
David E. DeMarle
Browse files
Options
Downloads
Patches
Plain Diff
ospray logic needs to be updated for upstream embree change
parent
16a9264c
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/ospray.cmake
+1
-0
1 addition, 0 deletions
projects/ospray.cmake
projects/patches/ospray-fixup-cray-isa.patch
+14
-0
14 additions, 0 deletions
projects/patches/ospray-fixup-cray-isa.patch
with
15 additions
and
0 deletions
projects/ospray.cmake
+
1
−
0
View file @
441506e1
...
...
@@ -35,5 +35,6 @@ superbuild_add_project(ospray
-DCMAKE_INSTALL_LIBDIR:STRING=lib
)
superbuild_apply_patch
(
ospray disable-testing
"Really disable testing"
)
superbuild_apply_patch
(
ospray fixup-cray-isa
"Fixup cray isa"
)
superbuild_add_extra_cmake_args
(
-DOSPRAY_INSTALL_DIR:PATH=<INSTALL_DIR>
)
This diff is collapsed.
Click to expand it.
projects/patches/ospray-fixup-cray-isa.patch
0 → 100644
+
14
−
0
View file @
441506e1
diff --git a/cmake/ospray_macros.cmake b/cmake/ospray_macros.cmake
index 7a6bb84..e21d643 100644
--- a/cmake/ospray_macros.cmake
+++ b/cmake/ospray_macros.cmake
@@ -62,7 +62,8 @@
macro(ospray_find_embree EMBREE_VERSION_REQUIRED)
endmacro()
macro(ospray_determine_embree_isa_support)
- if (EMBREE_MAX_ISA STREQUAL "NONE")
+ if (EMBREE_MAX_ISA STREQUAL "DEFAULT" OR
+ EMBREE_MAX_ISA STREQUAL "NONE")
set(EMBREE_ISA_SUPPORTS_SSE2 ${EMBREE_ISA_SSE2})
set(EMBREE_ISA_SUPPORTS_SSE4 ${EMBREE_ISA_SSE42})
set(EMBREE_ISA_SUPPORTS_AVX ${EMBREE_ISA_AVX})
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