933aacf7b6
* Provide draco-7_8_0. + Also provide a patchfile for draco-7_6_0 to support CrayPE builds. + Version 7.8.0 has a new variant `+caliper`. + Sort dependencies alphabetically after grouping by required and optional. * Remove patchfile that is no longer needed. + Newer versions of draco do not require this patch. + Older versions of draco are not supported for spectrum-mpi. * Change new variant +caliper to default to False.
108 lines
5.0 KiB
Diff
108 lines
5.0 KiB
Diff
diff --git a/config/platform_checks.cmake b/config/platform_checks.cmake
|
|
index d2ab4da9..4d3c14c2 100644
|
|
--- a/config/platform_checks.cmake
|
|
+++ b/config/platform_checks.cmake
|
|
@@ -77,54 +77,54 @@ endif()
|
|
#------------------------------------------------------------------------------#
|
|
macro( query_craype )
|
|
|
|
- if( NOT DEFINED CRAY_PE )
|
|
-
|
|
- # Is this a Cray machine?
|
|
- message( STATUS "Looking to see if we are building in a Cray Environment...")
|
|
- if( DEFINED ENV{CRAYPE_VERSION} )
|
|
- set( CRAY_PE ON CACHE BOOL
|
|
- "Are we building in a Cray Programming Environment?")
|
|
-
|
|
- # 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 "$ENV{SPACK_ROOT}/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
|
|
- NOT "$ENV{CRAYPE_LINK_TYPE}" MATCHES "dynamic$" )
|
|
- message( FATAL_ERROR
|
|
- "The build system requires that the Cray compiler wrappers (CC, cc, ftn) be "
|
|
- " used when configuring this product on a Cray system (CRAY_PE=${CRAY_PE}). The"
|
|
- " development environment must also support dynamic linking. The build system "
|
|
- " thinks you are trying to use:\n"
|
|
- " CMAKE_CXX_COMPILER = ${CMAKE_CXX_COMPILER}\n"
|
|
- " CMAKE_C_COMPILER = ${CMAKE_C_COMPILER}\n"
|
|
- " CMAKE_Fortran_COMPILER = ${CMAKE_Fortran_COMPILER}\n"
|
|
- " CRAYPE_LINK_TYPE = $ENV{CRAYPE_LINK_TYPE}\n"
|
|
- "If you are working on a system that runs the Cray Programming Environment, try"
|
|
- " setting the following variables and rerunning cmake from a clean build"
|
|
- " directory:\n"
|
|
- " export CXX=`which CC`\n"
|
|
- " export CC=`which cc`\n"
|
|
- " export FC=`which ftn`\n"
|
|
- " 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..."
|
|
- "found version $ENV{CRAYPE_VERSION}.")
|
|
- else()
|
|
- set( CRAY_PE OFF CACHE BOOL
|
|
- "Are we building in a Cray Programming Environment?")
|
|
- message( STATUS
|
|
- "Looking to see if we are building in a Cray Environment...no.")
|
|
- endif()
|
|
-
|
|
- endif()
|
|
+ # if( NOT DEFINED CRAY_PE )
|
|
+
|
|
+ # # Is this a Cray machine?
|
|
+ # message( STATUS "Looking to see if we are building in a Cray Environment...")
|
|
+ # if( DEFINED ENV{CRAYPE_VERSION} )
|
|
+ # set( CRAY_PE ON CACHE BOOL
|
|
+ # "Are we building in a Cray Programming Environment?")
|
|
+
|
|
+ # # 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 "$ENV{SPACK_ROOT}/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
|
|
+ # NOT "$ENV{CRAYPE_LINK_TYPE}" MATCHES "dynamic$" )
|
|
+ # message( FATAL_ERROR
|
|
+ # "The build system requires that the Cray compiler wrappers (CC, cc, ftn) be "
|
|
+ # " used when configuring this product on a Cray system (CRAY_PE=${CRAY_PE}). The"
|
|
+ # " development environment must also support dynamic linking. The build system "
|
|
+ # " thinks you are trying to use:\n"
|
|
+ # " CMAKE_CXX_COMPILER = ${CMAKE_CXX_COMPILER}\n"
|
|
+ # " CMAKE_C_COMPILER = ${CMAKE_C_COMPILER}\n"
|
|
+ # " CMAKE_Fortran_COMPILER = ${CMAKE_Fortran_COMPILER}\n"
|
|
+ # " CRAYPE_LINK_TYPE = $ENV{CRAYPE_LINK_TYPE}\n"
|
|
+ # "If you are working on a system that runs the Cray Programming Environment, try"
|
|
+ # " setting the following variables and rerunning cmake from a clean build"
|
|
+ # " directory:\n"
|
|
+ # " export CXX=`which CC`\n"
|
|
+ # " export CC=`which cc`\n"
|
|
+ # " export FC=`which ftn`\n"
|
|
+ # " 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..."
|
|
+ # "found version $ENV{CRAYPE_VERSION}.")
|
|
+ # else()
|
|
+ # set( CRAY_PE OFF CACHE BOOL
|
|
+ # "Are we building in a Cray Programming Environment?")
|
|
+ # message( STATUS
|
|
+ # "Looking to see if we are building in a Cray Environment...no.")
|
|
+ # endif()
|
|
+
|
|
+ # endif()
|
|
endmacro()
|
|
|
|
##---------------------------------------------------------------------------##
|