Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Steven Walton
VTK-m
Commits
e6a2089d
Commit
e6a2089d
authored
Sep 18, 2019
by
Robert Maynard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Require CMake 3.12+ for using OpenMP backend
parent
d366ed62
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
542 deletions
+2
-542
CMake/FindOpenMP.cmake
CMake/FindOpenMP.cmake
+0
-539
CMake/VTKmDeviceAdapters.cmake
CMake/VTKmDeviceAdapters.cmake
+1
-1
CMakeLists.txt
CMakeLists.txt
+0
-1
README.md
README.md
+1
-1
No files found.
CMake/FindOpenMP.cmake
deleted
100644 → 0
View file @
d366ed62
This diff is collapsed.
Click to expand it.
CMake/VTKmDeviceAdapters.cmake
View file @
e6a2089d
...
...
@@ -86,7 +86,7 @@ endif()
if
(
VTKm_ENABLE_OPENMP AND NOT TARGET vtkm::openmp
)
cmake_minimum_required
(
VERSION 3.
9
...3.15 FATAL_ERROR
)
cmake_minimum_required
(
VERSION 3.
12
...3.15 FATAL_ERROR
)
find_package
(
OpenMP 4.0 REQUIRED COMPONENTS CXX QUIET
)
add_library
(
vtkm::openmp INTERFACE IMPORTED GLOBAL
)
...
...
CMakeLists.txt
View file @
e6a2089d
...
...
@@ -250,7 +250,6 @@ if(NOT VTKm_INSTALL_ONLY_LIBRARIES)
${
VTKm_SOURCE_DIR
}
/CMake/FindTBB.cmake
${
VTKm_SOURCE_DIR
}
/CMake/FindMPI.cmake
${
VTKm_SOURCE_DIR
}
/CMake/FindOpenGL.cmake
${
VTKm_SOURCE_DIR
}
/CMake/FindOpenMP.cmake
DESTINATION
${
VTKm_INSTALL_CMAKE_MODULE_DIR
}
)
...
...
README.md
View file @
e6a2089d
...
...
@@ -65,8 +65,8 @@ VTK-m Requires:
+
Intel 17.0.4+
+
[
CMake
](
http://www.cmake.org/download/
)
+
CMake 3.8+
+
CMake 3.9+ (for OpenMP support)
+
CMake 3.11+ (for Visual Studio generator)
+
CMake 3.12+ (for OpenMP support)
+
CMake 3.13+ (for CUDA support)
Optional dependencies are:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment