Fix GTest include search path with other runtimes

Author: Meinersbur

flang-rt/CMakeLists.txt

@@ -43,7 +43,7 @@ if (LLVM_TREE_AVAILABLE)
   # flang-new uses the same resource dir as clang.
   include(GetClangResourceDir)
   get_clang_resource_dir(FLANGRT_BUILD_LIB_DIR PREFIX "${LLVM_LIBRARY_OUTPUT_INTDIR}/.." SUBDIR "lib${LLVM_LIBDIR_SUFFIX}")
-  get_clang_resource_dir(FLANGRT_INSTALL_LIB_DIR SUBDIR "lib${LLVM_LIBDIR_SUFFIX}") # No prefix, CMake's install command find the install prefix itself
+  get_clang_resource_dir(FLANGRT_INSTALL_LIB_DIR SUBDIR "lib${LLVM_LIBDIR_SUFFIX}") # No prefix, CMake's install command finds the install prefix itself
 else ()
   set(FLANGRT_BUILD_LIB_DIR "${LLVM_LIBRARY_OUTPUT_INTDIR}")
   set(FLANGRT_INSTALL_LIB_DIR "lib${LLVM_LIBDIR_SUFFIX}")

flang-rt/cmake/modules/AddFlangRT.cmake

@@ -102,8 +102,8 @@ function (add_flangrt_library name)
     else()
       llvm_map_components_to_libnames(llvm_libs Support)
     endif()
-    target_link_libraries(${name} PUBLIC  ${llvm_libs})
-    target_include_directories(${name} PRIVATE  ${LLVM_INCLUDE_DIRS})
+    target_link_libraries(${name} PUBLIC ${llvm_libs})
+    target_include_directories(${name} PUBLIC ${LLVM_INCLUDE_DIRS})
   endif ()
 
   # If this is part of the toolchain, put it into the compiler's resource

flang-rt/unittests/CMakeLists.txt

@@ -7,16 +7,19 @@
 #===------------------------------------------------------------------------===#
 
 # Add GTest if not already present.
-# Using a function so include_directories/LLVM_SUBPROJECT_TITLE does not propagate
+# Using a function so LLVM_SUBPROJECT_TITLE does not propagate.
 function (build_gtest)
-  include_directories("${LLVM_INCLUDE_DIR}" "${LLVM_MAIN_INCLUDE_DIR}")
   set(LLVM_SUBPROJECT_TITLE "Third-Party/Google Test")
   add_subdirectory("${LLVM_THIRD_PARTY_DIR}/unittest" "${CMAKE_CURRENT_BINARY_DIR}/third-party/unittest")
 endfunction ()
 if (NOT TARGET llvm_gtest)
   build_gtest()
 endif ()
 
+# LLVM's modified GTest depends on LLVM, but not all runtime projects using
+# GTest also add the include search path.
+target_include_directories(llvm_gtest PUBLIC "${LLVM_INCLUDE_DIR}" "${LLVM_MAIN_INCLUDE_DIR}")
+
 # Required because LLVMSupport is compiled with this option (by default).
 set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDLL)