Fixed minor caliper configuration issues

Note that caliper is not fully implemented as a CMake option yet

src/CMakeLists.txt

@@ -33,6 +33,7 @@ option(HYPRE_NO_GLOBAL_PARTITION  "Use assumed partition" ON)
 option(HYPRE_PRINT_ERRORS         "Print HYPRE errors" OFF)
 option(HYPRE_USING_OPENMP         "Use OpenMP" OFF)
 option(HYPRE_USING_FEI            "Use FEI" ON)
+option(HYPRE_USING_CALIPER        "Use Caliper" OFF)  # TODO: Finish this cmake feature
 
 if (HYPRE_SHARED)
   # FEI doesn't currently compile with shared
@@ -47,12 +48,6 @@ if (HYPRE_SEQUENTIAL)
   set (HYPRE_NO_GLOBAL_PARTITION OFF CACHE BOOL "" FORCE)
 endif ()
 
-find_package(caliper)
-
-if (caliper_FOUND)
-  set(HYPRE_USING_CALIPER ON)
-endif()
-
 #   --with-examples         Build example codes.
 #   --with-fei              Use internal FEI routines.
 #   --with-superlu          Use internal SuperLU routines.
@@ -751,10 +746,6 @@ include_directories(struct_ls)
 include_directories(sstruct_mv)
 include_directories(sstruct_ls)
 
-if (caliper_FOUND)
-  include_directories(${caliper_INCLUDE_DIR})
-endif()
-
 # Set library build type
 if (HYPRE_SHARED)
   set (BUILD_SHARED_LIBS ON CACHE INTERNAL "" FORCE)

src/config/configure.in

@@ -773,7 +773,7 @@ AC_ARG_WITH(caliper,
 AS_HELP_STRING([--with-caliper],
                [Use Caliper instrumentation (default is NO).]),
                [hypre_using_caliper=yes],
-               [with-caliper=no])
+               [hypre_using_caliper=no])
 
 AS_IF([test "x$with_caliper" = "xyes"],
       [AC_DEFINE(HYPRE_USING_CALIPER, 1, [Using Caliper instrumentation])],

src/configure

@@ -3153,7 +3153,7 @@ fi
 if test "${with_caliper+set}" = set; then :
   withval=$with_caliper; hypre_using_caliper=yes
 else
-  with-caliper=no
+  hypre_using_caliper=no
 fi