Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option to use KokkosKernels:: as target namespace #2017

Closed
wants to merge 1 commit into from
Closed

Add option to use KokkosKernels:: as target namespace #2017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ KOKKOSKERNELS_PACKAGE()

IF (NOT KOKKOSKERNELS_HAS_TRILINOS)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
# TODO The KOKKOSKERNELS_ENABLE_TARGET_NAMESPACE_CHANGE will be defaulted to ON during the 4.3 release cycle and
# removed after release 4.3 after the Kokkos:: namespace is changed to KokkosKernels::
KOKKOSKERNELS_ADD_OPTION(
"ENABLE_TARGET_NAMESPACE_CHANGE"
OFF
BOOL
"Whether to build KokkosKernels as a TPL - this is a TEMPORARY option added for a deprecation cycle to configure with the KokkosKernels:: namespace. Default: OFF"
)
KOKKOSKERNELS_ADD_OPTION(
"ENABLE_EXAMPLES"
OFF
Expand Down
9 changes: 9 additions & 0 deletions cmake/KokkosKernelsConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,12 @@ find_dependency(Kokkos HINTS @Kokkos_DIR@)

INCLUDE("${KokkosKernels_CMAKE_DIR}/KokkosKernelsTargets.cmake")

IF(NOT TARGET KokkosKernels::all_libs)
# CMake Error at <prefix>/lib/cmake/Kokkos/KokkosConfigCommon.cmake:10 (ADD_LIBRARY):
# ADD_LIBRARY cannot create ALIAS target "Kokkos::all_libs" because target
# "KokkosKernels::kokkoskernels" is imported but not globally visible.
IF(CMAKE_VERSION VERSION_LESS "3.18")
SET_TARGET_PROPERTIES(KokkosKernels::kokkoskernels PROPERTIES IMPORTED_GLOBAL ON)
ENDIF()
ADD_LIBRARY(KokkosKernels::all_libs ALIAS KokkosKernels::kokkoskernels)
ENDIF()
20 changes: 17 additions & 3 deletions cmake/kokkoskernels_tribits.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,23 @@ MACRO(KOKKOSKERNELS_PACKAGE_POSTPROCESS)
"${KokkosKernels_BINARY_DIR}/KokkosKernelsConfigVersion.cmake"
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/KokkosKernels)

INSTALL(EXPORT KokkosKernelsTargets
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/KokkosKernels
NAMESPACE Kokkos::)
# TODO The KOKKOSKERNELS_ENABLE_TARGET_NAMESPACE_CHANGE will be removed after release 4.3 after the
# Kokkos:: namespace is changed to KokkosKernels::
IF (KOKKOSKERNELS_ENABLE_TARGET_NAMESPACE_CHANGE)
INSTALL(EXPORT KokkosKernelsTargets
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/KokkosKernels
NAMESPACE KokkosKernels::)
ELSE()
IF(CMAKE_VERSION VERSION_GREATER "3.16")
# DEPRECATION was new in CMake version 3.17
MESSAGE(DEPRECATION "Use of the the Kokkos:: namespace for the Kokkos Kernels target is deprecated and will be changed to KokkosKernels:: in the 4.3 release cycle")
ELSE()
MESSAGE(WARNING "Use of the the Kokkos:: namespace for the Kokkos Kernels target is deprecated and will be changed to KokkosKernels:: in the 4.3 release cycle")
ENDIF()
INSTALL(EXPORT KokkosKernelsTargets
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/KokkosKernels
NAMESPACE Kokkos::)
ENDIF()
ENDIF()
ENDMACRO(KOKKOSKERNELS_PACKAGE_POSTPROCESS)

Expand Down