Simplified TPL CMake logic.

Author: corbett5

cmake/CMakeBasics.cmake

@@ -10,8 +10,8 @@ endif()
 option( ENABLE_TOTALVIEW_OUTPUT "" OFF )
 
 
-if( ( NOT BLT_CXX_STD STREQUAL c++14 ) AND (NOT BLT_CXX_STD STREQUAL c++11))
-    MESSAGE(FATAL_ERROR "c++11/14 is NOT enabled. LvArray requires c++11/14")
+if( NOT BLT_CXX_STD STREQUAL c++14 )
+    MESSAGE(FATAL_ERROR "c++14 is NOT enabled. LvArray requires c++14")
 endif()
 
 

cmake/Config.cmake

@@ -12,7 +12,7 @@ foreach( DEP in ${PREPROCESSOR_DEFINES})
     endif()
 endforeach()
 
-if( USE_ADDR2LINE )
+if( ENABLE_ADDR2LINE )
     if ( NOT DEFINED ADDR2LINE_EXEC )
         set( ADDR2LINE_EXEC /usr/bin/addr2line CACHE PATH "" )
     endif()

cmake/SetupTPL.cmake

@@ -4,7 +4,7 @@ set(thirdPartyLibs "")
 # RAJA
 ################################
 if(NOT EXISTS ${RAJA_DIR})
-    set(RAJA_DIR ${GEOSX_TPL_DIR}/raja)
+    message(FATAL_ERROR "RAJA_DIR must be defined and point to a valid directory when using RAJA.")
 endif()
 
 message(STATUS "Using RAJA from ${RAJA_DIR}")
@@ -21,39 +21,39 @@ set(thirdPartyLibs ${thirdPartyLibs} RAJA)
 ###############################
 if(ENABLE_UMPIRE)
     if(NOT EXISTS ${UMPIRE_DIR})
-        set(UMPIRE_DIR ${GEOSX_TPL_DIR}/chai)
+        message(FATAL_ERROR "UMPIRE_DIR must be defined and point to a valid directory when using Umpire.")
     endif()
 
-    message(STATUS "Using umpire at ${UMPIRE_DIR}")
+    message(STATUS "Using Umpire from ${UMPIRE_DIR}")
 
     find_package(umpire REQUIRED
-                 PATHS ${UMPIRE_DIR}/share/umpire/cmake/)
+                 PATHS ${UMPIRE_DIR})
 
     set(thirdPartyLibs ${thirdPartyLibs} umpire)
 else()
-    message(STATUS "Not using umpire.")
+    message(STATUS "Not using Umpire.")
 endif()
 
 ################################
 # CHAI
 ################################
 if(ENABLE_CHAI)
     if(NOT ENABLE_UMPIRE)
-        message(FATAL_ERROR "umpire must be enabled to use chai.")
+        message(FATAL_ERROR "Umpire must be enabled to use CHAI.")
     endif()
 
     if(NOT ENABLE_RAJA)
-        message(FATAL_ERROR "RAJA must be enabled to use chai.")
+        message(FATAL_ERROR "RAJA must be enabled to use CHAI.")
     endif()
 
     if(NOT EXISTS ${CHAI_DIR})
-        set(CHAI_DIR ${GEOSX_TPL_DIR}/chai)
+        message(FATAL_ERROR "CHAI_DIR must be defined and point to a valid directory when using CHAI.")
     endif()
 
-    message(STATUS "Using chai at ${CHAI_DIR}")
+    message(STATUS "Using CHAI from ${CHAI_DIR}")
 
     find_package(chai REQUIRED
-                 PATHS ${CHAI_DIR}/share/chai/cmake/)
+                 PATHS ${CHAI_DIR})
 
     # If this isn't done chai will add -lRAJA to the link line, but we don't link to RAJA like that.
     get_target_property(CHAI_LINK_LIBRARIES chai INTERFACE_LINK_LIBRARIES)
@@ -63,7 +63,7 @@ if(ENABLE_CHAI)
 
     set(thirdPartyLibs ${thirdPartyLibs} chai)
 else()
-    message(STATUS "Not using chai.")
+    message(STATUS "Not using CHAI.")
 endif()
 
 
@@ -72,29 +72,22 @@ endif()
 ################################
 if(ENABLE_CALIPER)
     if(NOT EXISTS ${CALIPER_DIR})
-        set(CALIPER_DIR ${GEOSX_TPL_DIR}/caliper)
+        message(FATAL_ERROR "CALIPER_DIR must be defined and point to a valid directory when using caliper.")
     endif()
 
-    message(STATUS "Using caliper at ${CALIPER_DIR}")
+    message(STATUS "Using caliper from ${CALIPER_DIR}")
 
     find_package(caliper REQUIRED
-                 PATHS ${CALIPER_DIR}/share/cmake/caliper)
- 
-    if(ENABLE_MPI)
-        set(caliper_LIBRARIES caliper-mpi)
-    else()
-        set(caliper_LIBRARIES caliper)
-    endif()
+                 PATHS ${CALIPER_DIR})
 
     blt_register_library(NAME caliper
                          INCLUDES ${caliper_INCLUDE_PATH}
-                         LIBRARIES ${caliper_LIBRARIES}
+                         LIBRARIES caliper
                          TREAT_INCLUDES_AS_SYSTEM ON)
 
     set(thirdPartyLibs ${thirdPartyLibs} caliper)
 else()
     message(STATUS "Not using caliper.")
 endif()
 
-
 set(thirdPartyLibs ${thirdPartyLibs} CACHE STRING "")

docs/sphinx/ArrayOfSets.rst

@@ -1,8 +1,8 @@
 ###############################################################################
-``Lvarray::ArrayOfSets``
+``LvArray::ArrayOfSets``
 ###############################################################################
 
-The ``LvArray::ArrayOfSets`` is very siilar to the ``LvArray::ArrayOfArrays`` except that the values of the inner arrays are sorted an unique like the ``LvArray::SortedArray``. If you are familiar with both of these classes the functionality of the ``LvArray::ArrayOfSets`` should be pretty straightforward.
+The ``LvArray::ArrayOfSets`` is very similar to the ``LvArray::ArrayOfArrays`` except that the values of the inner arrays are sorted an unique like the ``LvArray::SortedArray``. If you are familiar with both of these classes the functionality of the ``LvArray::ArrayOfSets`` should be pretty straightforward.
 
 Template arguments
 ------------------