Fix test_install with PAPI.

ginkgo-project · Dec 2, 2019 · d274c9c · d274c9c
1 parent efd4850
commit d274c9c
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 27 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -239,6 +239,7 @@ add_custom_target(test_install
  COMMAND ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} -H${Ginkgo_SOURCE_DIR}/test_install
  -B${Ginkgo_BINARY_DIR}/test_install
  -DCMAKE_PREFIX_PATH=${CMAKE_INSTALL_PREFIX}/${GINKGO_INSTALL_CONFIG_DIR}
+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
  COMMAND ${CMAKE_COMMAND} --build ${Ginkgo_BINARY_DIR}/test_install
  COMMAND ${Ginkgo_BINARY_DIR}/test_install/test_install
  COMMENT "Running a test on the installed binaries. This requires running `(sudo) make install` first.")

diff --git a/cmake/GinkgoConfig.cmake.in b/cmake/GinkgoConfig.cmake.in
@@ -68,6 +68,8 @@ set(GINKGO_HIP_NVCC_COMPILER_FLAGS @GINKGO_HIP_NVCC_COMPILER_FLAGS@)
 set(GINKGO_HIP_PLATFORM @GINKGO_HIP_PLATFORM@)
 set(GINKGO_HIP_AMDGPU @GINKGO_HIP_AMDGPU@)
 
+set(GINKGO_HAVE_PAPI_SDE @GINKGO_HAVE_PAPI_SDE@)
+
 # Ginkgo external package variables
 set(GINKGO_USE_EXTERNAL_CAS "@GINKGO_USE_EXTERNAL_CAS@")
 set(GINKGO_USE_EXTERNAL_GTEST "@GINKGO_USE_EXTERNAL_GTEST@")
@@ -87,10 +89,13 @@ set(TPL_RAPIDJSON_INCLUDE_DIRS "@TPL_RAPIDJSON_INCLUDE_DIRS@")
 # Ginkgo installation configuration
 set(GINKGO_CONFIG_FILE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 string(REPLACE "@GINKGO_INSTALL_CONFIG_DIR@" "" GINKGO_INSTALL_PREFIX "${GINKGO_CONFIG_FILE_PATH}")
-set(GINKGO_INSTALL_INCLUDE_DIR "@GINKGO_INSTALL_INCLUDE_DIR@")
-set(GINKGO_INSTALL_LIBRARY_DIR "@GINKGO_INSTALL_LIBRARY_DIR@")
-set(GINKGO_INSTALL_PKGCONFIG_DIR "@GINKGO_INSTALL_PKGCONFIG_DIR@")
-set(GINKGO_INSTALL_CONFIG_DIR "@GINKGO_INSTALL_CONFIG_DIR@")
+set(GINKGO_INSTALL_INCLUDE_DIR "${GINKGO_INSTALL_PREFIX}/@GINKGO_INSTALL_INCLUDE_DIR@")
+set(GINKGO_INSTALL_LIBRARY_DIR "${GINKGO_INSTALL_PREFIX}/@GINKGO_INSTALL_LIBRARY_DIR@")
+set(GINKGO_INSTALL_PKGCONFIG_DIR "${GINKGO_INSTALL_PREFIX}/@GINKGO_INSTALL_PKGCONFIG_DIR@")
+set(GINKGO_INSTALL_CONFIG_DIR "${GINKGO_INSTALL_PREFIX}/@GINKGO_INSTALL_CONFIG_DIR@")
+set(GINKGO_INSTALL_MODULE_DIR "${GINKGO_INSTALL_PREFIX}/@GINKGO_INSTALL_MODULE_DIR@")
+set(CMAKE_MODULE_PATH "${GINKGO_INSTALL_MODULE_DIR}")
+
 
 set(GINKGO_INTERFACE_LINK_LIBRARIES "@GINKGO_INTERFACE_LINK_LIBRARIES@")
 set(GINKGO_INTERFACE_LINK_FLAGS "@GINKGO_INTERFACE_LINK_FLAGS@")

diff --git a/cmake/Modules/FindPAPI.cmake b/cmake/Modules/FindPAPI.cmake
@@ -68,30 +68,31 @@ if(PAPI_INCLUDE_DIR)
 
  if (PAPI_LIBRARY)
  # find the components
- foreach(component IN LISTS PAPI_FIND_COMPONENTS)
- file(WRITE "${CMAKE_BINARY_DIR}/papi_${component}_detect.c"
- "
- #include <papi.h>
- int main() {
- int retval;
- retval = PAPI_library_init(PAPI_VER_CURRENT);
- if (retval != PAPI_VER_CURRENT && retval > 0)
- return -1;
- if (PAPI_get_component_index(\"${component}\") < 0)
- return 0;
- return 1;
- }
- ")
- try_run(PAPI_${component}_FOUND
- gko_result_unused
- "${CMAKE_BINARY_DIR}"
- "${CMAKE_BINARY_DIR}/papi_${component}_detect.c"
- LINK_LIBRARIES ${PAPI_LIBRARY}
- )
+ enable_language(C)
+ foreach(component IN LISTS PAPI_FIND_COMPONENTS)
+ file(WRITE "${CMAKE_BINARY_DIR}/papi_${component}_detect.c"
+ "
+ #include <papi.h>
+ int main() {
+ int retval;
+ retval = PAPI_library_init(PAPI_VER_CURRENT);
+ if (retval != PAPI_VER_CURRENT && retval > 0)
+ return -1;
+ if (PAPI_get_component_index(\"${component}\") < 0)
+ return 0;
+ return 1;
+ }"
+ )
+ try_run(PAPI_${component}_FOUND
+ gko_result_unused
+ "${CMAKE_BINARY_DIR}"
+ "${CMAKE_BINARY_DIR}/papi_${component}_detect.c"
+ LINK_LIBRARIES ${PAPI_LIBRARY}
+ )
 
- if (NOT PAPI_${component}_FOUND EQUAL 1)
- unset(PAPI_${component}_FOUND)
- endif()
+  if (NOT PAPI_${component}_FOUND EQUAL 1)
+  unset(PAPI_${component}_FOUND)
+  endif()
  endforeach()
  endif()
 endif()

diff --git a/cmake/install_helpers.cmake b/cmake/install_helpers.cmake
@@ -6,6 +6,7 @@ set(GINKGO_INSTALL_INCLUDE_DIR "include")
 set(GINKGO_INSTALL_LIBRARY_DIR "lib")
 set(GINKGO_INSTALL_PKGCONFIG_DIR "lib/pkgconfig")
 set(GINKGO_INSTALL_CONFIG_DIR "lib/cmake/Ginkgo")
+set(GINKGO_INSTALL_MODULE_DIR "lib/cmake/Ginkgo/Modules")
 
 function(ginkgo_install_library name subdir)
  # install .so and .a files
@@ -33,6 +34,9 @@ function(ginkgo_install)
  install(FILES "${Ginkgo_SOURCE_DIR}/third_party/papi_sde/papi_sde_interface.h"
  DESTINATION "${GINKGO_INSTALL_INCLUDE_DIR}/third_party/papi_sde"
  )
+ install(FILES "${Ginkgo_SOURCE_DIR}/cmake/Modules/FindPAPI.cmake"
+ DESTINATION "${GINKGO_INSTALL_MODULE_DIR}/"
+ )
  endif()
 
  # export targets

diff --git a/test_install/CMakeLists.txt b/test_install/CMakeLists.txt
@@ -7,6 +7,9 @@ find_package(Ginkgo REQUIRED
  # Alternatively, use `cmake -DCMAKE_PREFIX_PATH=<ginkgo_install_dir>` to specify the install directory
  )
 
+if(GINKGO_HAVE_PAPI_SDE)
+ find_package(PAPI REQUIRED OPTIONAL_COMPONENTS sde)
+endif()
 
 # Needed because of a known issue with CUDA while linking statically.
 # For details, see https://gitlab.kitware.com/cmake/cmake/issues/18614