Skip to content

Commit

Permalink
Merge pull request #6108 from dalg24/drop_algorithms_and_containers_c…
Browse files Browse the repository at this point in the history
…onfig_files

Drop pointless `Kokkos{Algorithms,Containers}_config.h` files
  • Loading branch information
dalg24 authored May 8, 2023
2 parents 5fa72b5 + 7ef7d02 commit cf82edc
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 17 deletions.
4 changes: 0 additions & 4 deletions algorithms/cmake/KokkosAlgorithms_config.h.in

This file was deleted.

5 changes: 0 additions & 5 deletions algorithms/src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
CONFIGURE_FILE(
${PACKAGE_SOURCE_DIR}/algorithms/cmake/KokkosAlgorithms_config.h.in
${CMAKE_CURRENT_BINARY_DIR}/KokkosAlgorithms_config.h )

#I have to leave these here for tribits
KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
Expand All @@ -10,7 +6,6 @@ KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})

FILE(GLOB ALGO_HEADERS *.hpp)
FILE(GLOB ALGO_SOURCES *.cpp)
LIST(APPEND ALGO_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/KokkosAlgorithms_config.h)
APPEND_GLOB(ALGO_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/std_algorithms/*.hpp)
APPEND_GLOB(ALGO_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/std_algorithms/impl/*.hpp)

Expand Down
4 changes: 0 additions & 4 deletions containers/cmake/KokkosContainers_config.h.in

This file was deleted.

4 changes: 0 additions & 4 deletions containers/src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
CONFIGURE_FILE(
${PACKAGE_SOURCE_DIR}/containers/cmake/KokkosContainers_config.h.in
${CMAKE_CURRENT_BINARY_DIR}/KokkosContainers_config.h )

#need these here for now
KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
Expand Down

0 comments on commit cf82edc

Please sign in to comment.