diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1534c8d2e..56188e97e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -306,8 +306,11 @@ if (WITH_ADIAK)
       list(APPEND CALIPER_EXTERNAL_LIBS ${CMAKE_DL_LIBS})
     endif()
   else()
+    set(CALIPER_HAVE_ADIAK FALSE)
     message(WARNING "Adiak support was requested but Adiak was not found")
   endif()
+else()
+  set(CALIPER_HAVE_ADIAK FALSE)
 endif()
 
 if (WITH_KOKKOS)
@@ -528,11 +531,15 @@ if (INSTALL_CONFIG)
       SameMajorVersion
   )
 
+  set(caliper_INSTALL_INCLUDE_DIR "include/")
+
   configure_package_config_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/caliper-config.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/caliper-config.cmake"
     INSTALL_DESTINATION
       ${CMAKE_INSTALL_DATAROOTDIR}/cmake/caliper
+    PATH_VARS
+      caliper_INSTALL_INCLUDE_DIR
   )
 
   install(
diff --git a/caliper-config.cmake.in b/caliper-config.cmake.in
index 600c1b167..c3a6f9476 100644
--- a/caliper-config.cmake.in
+++ b/caliper-config.cmake.in
@@ -4,6 +4,8 @@ include(CMakeFindDependencyMacro)
 
 include("${CMAKE_CURRENT_LIST_DIR}/caliper-targets.cmake")
 
+set_and_check(caliper_INCLUDE_DIR "@PACKAGE_caliper_INSTALL_INCLUDE_DIR@")
+
 if (@CALIPER_HAVE_ADIAK@)
   if (NOT TARGET adiak::adiak)
     set(CALIPER_ADIAK_DIR @adiak_DIR@)