apply review suggestions

- revert mdspan-only change from core/src/CMakeLists.txt - remove no longer needed `KOKKOS_HAS_TRILINOS` from `KOKKOS_LIB_INCLUDE_DIRECTORIES`
ndellingwood · Jun 26, 2024 · f6a8f56 · f6a8f56
1 parent 560b546
commit f6a8f56
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/cmake/kokkos_tribits.cmake b/cmake/kokkos_tribits.cmake
@@ -462,15 +462,10 @@ ENDFUNCTION()
 
 
 FUNCTION(KOKKOS_LIB_INCLUDE_DIRECTORIES TARGET)
-  IF(KOKKOS_HAS_TRILINOS)
-    #ignore the target, tribits doesn't do anything directly with targets
-    TRIBITS_INCLUDE_DIRECTORIES(${ARGN})
-  ELSE() #append to a list for later
-    KOKKOS_LIB_TYPE(${TARGET} INCTYPE)
-    FOREACH(DIR ${ARGN})
-      TARGET_INCLUDE_DIRECTORIES(${TARGET} ${INCTYPE} $<BUILD_INTERFACE:${DIR}>)
-    ENDFOREACH()
-  ENDIF()
+  KOKKOS_LIB_TYPE(${TARGET} INCTYPE)
+  FOREACH(DIR ${ARGN})
+    TARGET_INCLUDE_DIRECTORIES(${TARGET} ${INCTYPE} $<BUILD_INTERFACE:${DIR}>)
+  ENDFOREACH()
 ENDFUNCTION()
 
 FUNCTION(KOKKOS_LIB_COMPILE_OPTIONS TARGET)

diff --git a/core/src/CMakeLists.txt b/core/src/CMakeLists.txt
@@ -166,9 +166,6 @@ IF (Kokkos_ENABLE_IMPL_MDSPAN)
       kokkoscore
       ${CMAKE_CURRENT_SOURCE_DIR}/../../tpls/mdspan/include
     )
-    if(KOKKOS_HAS_TRILINOS)
-      TARGET_INCLUDE_DIRECTORIES(kokkoscore PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../tpls/mdspan/include>")
-    endif()
 
     APPEND_GLOB(KOKKOS_CORE_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../../tpls/mdspan/include/experimental/__p0009_bits/*.hpp)
     APPEND_GLOB(KOKKOS_CORE_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../../tpls/mdspan/include/experimental/mdspan)