Use a built-in copy of gotcha (#173)

* Add built-in copy of gotcha * Testing tweaks
LLNL · May 29, 2019 · a48f567 · a48f567
1 parent 4840d22
commit a48f567
Show file tree

Hide file tree

Showing 31 changed files with 4,498 additions and 51 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,7 +63,7 @@ if (BUILD_SHARED_LIBS)
   endif("${isSystemDir}" STREQUAL "-1")
 else()
   # Try to find static libs first for static builds
-  list(INSERT CMAKE_FIND_LIBRARY_SUFFIXES 0 .a)
+  # list(INSERT CMAKE_FIND_LIBRARY_SUFFIXES 0 .a)
   # Disable rpaths
   set(CMAKE_SKIP_RPATH TRUE)
 endif(BUILD_SHARED_LIBS)
@@ -203,10 +203,10 @@ if (WITH_GOTCHA)
     endif()
   else()
     set(CALIPER_GOTCHA_CMAKE_MSG "Yes, using internal")
-    set(gotcha_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/ext/gotcha/gotcha-download/gotcha-src/include)
-    set(gotcha_LIBRARIES gotcha)
+    set(gotcha_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/ext/gotcha/include)
+    set(gotcha_LIBRARIES $<TARGET_OBJECTS:gotcha>)
     set(CALIPER_HAVE_GOTCHA TRUE)
-    list(APPEND CALIPER_EXTERNAL_LIBS ${gotcha_LIBRARIES})
+    list(APPEND CALIPER_EXTERNAL_SOURCES ${gotcha_LIBRARIES})
   endif()
 endif()
 

diff --git a/cmake/hostconfig/gitlab-quartz-intel.cmake b/cmake/hostconfig/gitlab-quartz-intel.cmake
@@ -21,7 +21,7 @@ set(WITH_DYNINST  Off CACHE BOOL "") # turn off for now
 set(WITH_SAMPLER  On  CACHE BOOL "")
 set(WITH_MPI      On  CACHE BOOL "")
 set(WITH_MPIT     Off CACHE BOOL "") # default toss3 mvapich2-2.2 doesn't have any MPI-T stuff
-set(WITH_GOTCHA   Off CACHE BOOL "")
+set(WITH_GOTCHA   On  CACHE BOOL "")
 set(WITH_VTUNE    On  CACHE BOOL "")
 
 set(WITH_DOCS     Off CACHE BOOL "")

diff --git a/codecov.yml b/codecov.yml
@@ -1,5 +1,6 @@
 coverage:
-  ignore: 
+  ignore:
+    - ext/**
     - test/**
     - **/test/**
     - **/rapidjson/**
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
@@ -3,6 +3,6 @@ if(BUILD_TESTING)
 endif()
 
 if (WITH_GOTCHA AND NOT USE_EXTERNAL_GOTCHA)
-  add_subdirectory(gotcha)
+  add_subdirectory(gotcha/src)
 endif()
 
diff --git a/ext/gotcha/CMakeLists.txt b/ext/gotcha/CMakeLists.txt
diff --git a/ext/gotcha/gotcha-download_CMakeLists.txt.in b/ext/gotcha/gotcha-download_CMakeLists.txt.in
diff --git a/ext/gotcha/include/CMakeLists.txt b/ext/gotcha/include/CMakeLists.txt
@@ -0,0 +1 @@
+install(DIRECTORY gotcha DESTINATION include FILES_MATCHING PATTERN *.h)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		install(DIRECTORY gotcha DESTINATION include FILES_MATCHING PATTERN *.h)