Cleanup for release prep

LLNL · Nov 13, 2019 · d0c9271 · d0c9271
1 parent 5514a87
commit d0c9271
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 860 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,7 +39,7 @@ option(WITH_LIBDW     "Enable libdw support (for module detection in callpath se
 option(WITH_CALLPATH  "Enable callpath service (requires libunwind)" FALSE)
 option(WITH_MPI       "Enable MPI" FALSE)
 # option(WITH_MPIT      "Enable MPI-T" FALSE)
-option(WITH_OMPT      "Enable OMPT" FALSE)
+# option(WITH_OMPT      "Enable OMPT" FALSE)
 option(WITH_SAMPLER   "Enable Linux sampler (x86 and PPC Linux only)" FALSE)
 option(WITH_DYNINST   "Enable dyninst (for symbollookup service" FALSE)
 option(WITH_GOTCHA    "Enable GOTCHA wrapping" ${CALIPER_HAVE_LINUX})
@@ -210,17 +210,6 @@ if (WITH_GOTCHA)
 endif()
 
 if (WITH_ADIAK)
-  # find_library(adiak_LIBRARIES
-  #   NAMES adiak
-  #   HINTS ${adiak_DIR}/lib)
-  # find_path(adiak_INCLUDE_DIRS
-  #   NAMES adiak.h
-  #   HINTS ${adiak_DIR}/include)
-  # include(FindPackageHandleStandardArgs)
-  # find_package_handle_standard_args(adiak DEFAULT_MSG
-  #   adiak_LIBRARIES
-  #   adiak_INCLUDE_DIRS)
-  # mark_as_advanced(adiak_LIBRARIES adiak_INCLUDE_DIRS)  
   find_package(adiak)
   if (adiak_FOUND)
     get_target_property(_adiak_location adiak LOCATION)

diff --git a/cmake/hostconfig/llnl-cab-gcc.cmake b/cmake/hostconfig/llnl-cab-gcc.cmake
diff --git a/cmake/hostconfig/llnl-vulcan.cmake b/cmake/hostconfig/llnl-vulcan.cmake
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -11,7 +11,6 @@ add_subdirectory(common)
 add_subdirectory(reader)
 add_subdirectory(services)
 add_subdirectory(caliper)
-add_subdirectory(caliper-stub)
 
 if (CALIPER_HAVE_MPI)
   add_subdirectory(mpi-common)

diff --git a/src/caliper-stub/Annotation.cpp b/src/caliper-stub/Annotation.cpp
diff --git a/src/caliper-stub/CMakeLists.txt b/src/caliper-stub/CMakeLists.txt