48bfffd32c
* Update version for package Draco
+ Add support for `draco-7.7.0`.
+ Introduces new `+cuda` variant. This variant is only allowed in version
`7.7.0:`.
+ Restrict `random123` to compatible versions.
+ Restrict `libquo` to compatible versions.
+ Moving forward, require `python@3:`
+ Moving forward, the ``+superlu_dist` variant is not longer supported.
+ Improve printed output for `--test` mode by adding `ctest` option
`--output-on-failure`
+ Provide a patch to support for IBM Spectrum-MPI in version `7.7.0:`
+ Provide a patch to allow variant `~cuda` to actually disable GPU portions of
the code when a GPU is discovered on the local system.
* Remove unnecessary function decoration.
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
diff --git a/config/compilerEnv.cmake b/config/compilerEnv.cmake
|
|
index a4996822..413f6836 100644
|
|
--- a/config/compilerEnv.cmake
|
|
+++ b/config/compilerEnv.cmake
|
|
@@ -741,6 +741,18 @@ macro(dbsSetupCuda)
|
|
# User option to disable Cuda, even when it is available.
|
|
option(USE_CUDA "Use Cuda?" ON)
|
|
|
|
+ endif()
|
|
+
|
|
+ # Save the results
|
|
+ set( HAVE_CUDA ${HAVE_CUDA} CACHE BOOL
|
|
+ "Should we build CUDA portions of this project?" FORCE )
|
|
+ if( HAVE_CUDA AND USE_CUDA )
|
|
+
|
|
+ # Use this string in 'project(foo ${CUDA_DBS_STRING})' commands to enable
|
|
+ # cuda per project.
|
|
+ set( CUDA_DBS_STRING "CUDA" CACHE STRING
|
|
+ "If CUDA is available, this variable is 'CUDA'")
|
|
+
|
|
# Use this string as a toggle when calling add_component_library or
|
|
# add_scalar_tests to force compiling with nvcc.
|
|
set( COMPILE_WITH_CUDA LINK_LANGUAGE CUDA )
|
|
@@ -752,14 +764,7 @@ macro(dbsSetupCuda)
|
|
message(FATAL_ERROR "Build system does not support "
|
|
"CUDACXX=${CMAKE_CUDA_COMPILER}")
|
|
endif()
|
|
- endif()
|
|
|
|
- # Save the results
|
|
- set( HAVE_CUDA ${HAVE_CUDA} CACHE BOOL
|
|
- "Should we build CUDA portions of this project?" FORCE )
|
|
- if( ${HAVE_CUDA} )
|
|
- set( CUDA_DBS_STRING "CUDA" CACHE STRING
|
|
- "If CUDA is available, this variable is 'CUDA'")
|
|
endif()
|
|
|
|
endmacro()
|