0c9ac8d8d1
* draco: update versions + Added versions 7.3.0 and 7.4.0. + Change several variants to be default TRUE since most consumers need these variants enabled (eospac, lapack, parmetis, superlu-dist). Change variant name for `+superlu_dist` to use hyphen instead of underscore. This makes the variant name consistent with the spackage name for `superlu-dist`. + Clean up `depends_on` instructions and avoid specifying `type` when possible. + Provide patch files that are necessary for some machines (mostly Cray machines). * Remove trailing whitespace. * Revert variant name to use underscore. * add maintainer information.
22 lines
947 B
Diff
22 lines
947 B
Diff
diff --git a/config/platform_checks.cmake b/config/platform_checks.cmake
|
|
index c9841b0d..aeecc767 100644
|
|
--- a/config/platform_checks.cmake
|
|
+++ b/config/platform_checks.cmake
|
|
@@ -88,6 +88,8 @@ macro( query_craype )
|
|
# We expect developers to use the Cray compiler wrappers (especially in
|
|
# setupMPI.cmake). See also
|
|
# https://cmake.org/cmake/help/latest/module/FindMPI.html
|
|
+ if( NOT "$ENV{CXX}" MATCHES "/lib/spack/env/" )
|
|
+ # skip this check if building from within spack.
|
|
if( NOT "$ENV{CXX}" MATCHES "CC$" OR
|
|
NOT "$ENV{CC}" MATCHES "cc$" OR
|
|
NOT "$ENV{FC}" MATCHES "ftn$" OR
|
|
@@ -110,6 +112,7 @@ macro( query_craype )
|
|
" export CRAYPE_LINK_TYPE=dynamic\n"
|
|
"Otherwise please email this error message and other related information to"
|
|
" draco@lanl.gov.\n" )
|
|
+ endif()
|
|
endif()
|
|
message( STATUS
|
|
"Looking to see if we are building in a Cray Environment..."
|