Add Fortran include dir to export target. Fixes #501

Author: daboehme

CMakeLists.txt

@@ -114,6 +114,7 @@ if (WITH_FORTRAN)
   enable_language(Fortran)
   set(CMAKE_Fortran_MODULE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/fortran")
   set(CALIPER_Fortran_CMAKE_MSG "Yes, using ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION}")
+  set(CALIPER_HAVE_FORTRAN TRUE)
 endif()
 
 if (BUILD_TESTING)

examples/apps/CMakeLists.txt

@@ -45,7 +45,6 @@ if (WITH_FORTRAN)
   foreach(app ${CALIPER_Fortran_EXAMPLE_APPS})
     add_executable(${app} ${app}.f)
     set_source_files_properties(${app}.f PROPERTIES Fortran_FORMAT FREE)
-    target_include_directories(${app} PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY})
     target_link_libraries(${app} caliper)
   endforeach()
 endif()

src/CMakeLists.txt

@@ -36,6 +36,14 @@ set_target_properties(caliper PROPERTIES VERSION ${CALIPER_VERSION})
 
 target_compile_features(caliper PUBLIC cxx_std_11)
 
+if (CALIPER_HAVE_FORTRAN)
+  target_include_directories(
+      caliper
+    PUBLIC
+      "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/caliper/fortran>"
+  )
+endif()
+
 if (CALIPER_HAVE_MPI)
   target_link_libraries(caliper PUBLIC ${MPI_CXX_LIBRARIES})
 endif()

src/interface/c_fortran/CMakeLists.txt

@@ -7,11 +7,20 @@ set(CALIPER_INTERFACE_SOURCES
   wrapScopeAnnotation.cpp
   utilCaliper.cpp)
 
-if (WITH_FORTRAN)
+if (CALIPER_HAVE_FORTRAN)
   list(APPEND CALIPER_INTERFACE_SOURCES
     wrapfcaliper.F)
-  set_source_files_properties(wrapfcaliper.F PROPERTIES Fortran_FORMAT FREE)  
+  set_source_files_properties(wrapfcaliper.F PROPERTIES Fortran_FORMAT FREE)
 endif()
 
 add_library(caliper-interface OBJECT ${CALIPER_INTERFACE_SOURCES})
-target_compile_features(caliper-interface PUBLIC cxx_std_11)
+target_compile_features(caliper-interface PUBLIC cxx_std_11)
+
+if (CALIPER_HAVE_FORTRAN)
+  target_include_directories(
+    caliper-interface
+  PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_Fortran_MODULE_DIRECTORY}>"
+    "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/caliper/fortran>"
+  )
+endif()

test/ci_app_tests/CMakeLists.txt

@@ -124,7 +124,6 @@ if (WITH_FORTRAN)
   foreach(app ${CALIPER_CI_Fortran_TEST_APPS})
     add_executable(${app} ${app}.f)
     set_source_files_properties(${app}.f PROPERTIES Fortran_FORMAT FREE)
-    target_include_directories(${app} PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY})
     target_link_libraries(${app} caliper)
   endforeach()