export updates to fix backwards compatibility: kokkos#1924 and kokkos…

…#1930

cmake/KokkosConfig.cmake.in

@@ -0,0 +1,52 @@
+@PACKAGE_INIT@ 
+
+# Compute paths
+GET_FILENAME_COMPONENT(Kokkos_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+SET(Kokkos_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
+
+include(CMakeFindDependencyMacro)
+
+
+# These are IMPORTED targets created by KokkosTargets.cmake
+SET(Kokkos_LIBRARY_DIRS @INSTALL_LIB_DIR@)
+SET(Kokkos_LIBRARIES @Kokkos_LIBRARIES_NAMES@)
+SET(Kokkos_TPL_LIBRARIES @KOKKOS_LIBS@)
+SET(Kokkos_SEPARATE_LIBS @KOKKOS_SEPARATE_LIBS@)
+SET(Kokkos_TARGETS_INSTALL_DIR @KOKKOS_TARGETS_INSTALL_DIR@)
+
+SET(Kokkos_ENABLE_Cuda @Kokkos_ENABLE_Cuda@)
+SET(Kokkos_ENABLE_OpenMP @Kokkos_ENABLE_OpenMP@)
+SET(Kokkos_ENABLE_Pthread @Kokkos_ENABLE_Pthread@) 
+SET(Kokkos_ENABLE_Serial @Kokkos_ENABLE_Serial@)
+
+INCLUDE("${Kokkos_CMAKE_DIR}/KokkosTargets.cmake")
+INCLUDE("${Kokkos_CMAKE_DIR}/KokkosDeprecatedTargets.cmake")
+
+
+#we only need to worry about minor version comparison
+#we will have already failed if the major versions mismatch
+if (${Kokkos_FIND_VERSION_MINOR})
+
+if (${Kokkos_FIND_VERSION_MINOR} LESS ${Kokkos_VERSION_MINOR})
+# Set the target properties necessary to ensure backwards
+# or deprecated compatibility
+if (${Kokkos_SEPARATE_LIBS})
+#Only need to set kokkoscore, flags should propagate to other targets
+set_property(TARGET kokkos::kokkoscore APPEND PROPERTY
+ INTERFACE_COMPILE_DEFINITIONS "KOKKOS_ENABLE_DEPRECATED_CODE"
+)
+set_property(TARGET kokkoscore APPEND PROPERTY
+ INTERFACE_COMPILE_DEFINITIONS "KOKKOS_ENABLE_DEPRECATED_CODE"
+)
+else()
+set_property(TARGET kokkos::kokkos APPEND PROPERTY
+ INTERFACE_COMPILE_DEFINITIONS "KOKKOS_ENABLE_DEPRECATED_CODE"
+)
+set_property(TARGET kokkos APPEND PROPERTY
+ INTERFACE_COMPILE_DEFINITIONS "KOKKOS_ENABLE_DEPRECATED_CODE"
+)
+endif()
+endif()
+
+endif()
+

cmake/kokkos_build.cmake

@@ -20,8 +20,10 @@ SET(INSTALL_INCLUDE_DIR ${KOKKOS_HEADER_DIR} CACHE PATH
  "Installation directory for header files")
 IF(WIN32 AND NOT CYGWIN)
  SET(DEF_INSTALL_CMAKE_DIR cmake)
+ SET(STD_INSTALL_CMAKE_DIR cmake)
 ELSE()
- SET(DEF_INSTALL_CMAKE_DIR lib/cmake/Kokkos)
+ SET(DEF_INSTALL_CMAKE_DIR lib/CMake/Kokkos)
+ SET(STD_INSTALL_CMAKE_DIR lib/cmake)
 ENDIF()
 
 SET(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH
@@ -95,18 +97,6 @@ IF(KOKKOS_SEPARATE_LIBS)
 
  target_link_libraries(kokkoscore PUBLIC "${KOKKOS_LINK_FLAGS}")
 
- # Install the kokkoscore library
- install(EXPORT kokkoscore
- FILE kokkosCoreTargets.cmake
- #NAMESPACE kokkos::
- DESTINATION ${INSTALL_CMAKE_DIR})
-
- # Install the kokkocontainers library
- INSTALL (TARGETS kokkoscore EXPORT kokkoscore
- #EXPORT KokkosTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
- LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
- RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
  # kokkoscontainers
  if (DEFINED KOKKOS_CONTAINERS_SRCS)
@@ -121,18 +111,6 @@ IF(KOKKOS_SEPARATE_LIBS)
  kokkoscore
  )
 
- install(EXPORT kokkoscontainers
- FILE kokkosContainersTargets.cmake
- #NAMESPACE kokkos::
- DESTINATION ${INSTALL_CMAKE_DIR})
-
- # Install the kokkocontainers library
- INSTALL (TARGETS kokkoscontainers EXPORT kokkoscontainers
- #EXPORT KokkosTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
- LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
- RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-
  # kokkosalgorithms - Build as interface library since no source files.
  ADD_LIBRARY(
  kokkosalgorithms
@@ -152,23 +130,39 @@ IF(KOKKOS_SEPARATE_LIBS)
  INTERFACE kokkoscore
  )
 
- install(EXPORT kokkosalgorithms 
- FILE kokkosAlgorithmsTargets.cmake
- #NAMESPACE kokkos::
- DESTINATION ${INSTALL_CMAKE_DIR})
+ SET (Kokkos_LIBRARIES_NAMES kokkoscore kokkoscontainers kokkosalgorithms)
 
- # Install the kokkocontainers library
- INSTALL (TARGETS kokkosalgorithms EXPORT kokkosalgorithms
- #EXPORT KokkosTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
- LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
- RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+ # Install the kokkoscore library
+ #normally, we would only do a single install
+ #to the standard lib/cmake using a namespaced target
+ #however, we want to preserve backward compatibility
+ #thus we do with/without namespace to both 
+ #standard and kokkos-specific install locations
+ install(TARGETS kokkoscore kokkoscontainers kokkosalgorithms
+ EXPORT kokkos
+ INCLUDES DESTINATION include
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+ RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
- SET (Kokkos_LIBRARIES_NAMES kokkoscore kokkoscontainers kokkosalgorithms)
+ install(EXPORT kokkos
+ FILE KokkosTargets.cmake
+ NAMESPACE kokkos::
+ DESTINATION ${INSTALL_CMAKE_DIR})
+ install(EXPORT kokkos
+ FILE KokkosTargets.cmake
+ NAMESPACE kokkos::
+ DESTINATION ${STD_INSTALL_CMAKE_DIR})
+ install(EXPORT kokkos
+ FILE KokkosDeprecatedTargets.cmake
+ DESTINATION ${INSTALL_CMAKE_DIR})
+ install(EXPORT kokkos
+ FILE KokkosDeprecatedTargets.cmake
+ DESTINATION ${STD_INSTALL_CMAKE_DIR})
 
  export(TARGETS kokkoscore kokkosalgorithms kokkoscontainers
- #NAMESPACE kokkos::
- FILE kokkosTargets.cmake)
+ NAMESPACE kokkos::
+ FILE KokkosTargets.cmake)
 
 ELSE()
  # kokkos
@@ -225,41 +219,53 @@ ELSE()
  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
  RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
+ #normally, we would only do a single install
+ #to the standard lib/cmake using a namespaced target
+ #however, we want to preserve backward compatibility
+ #thus we do with/without namespace to both 
+ #standard and kokkos-specific install locations
  install(EXPORT kokkos
  FILE KokkosTargets.cmake
- #NAMESPACE kokkos::
+ NAMESPACE kokkos::
  DESTINATION ${INSTALL_CMAKE_DIR})
+ install(EXPORT kokkos
+ FILE KokkosTargets.cmake
+ NAMESPACE kokkos::
+ DESTINATION ${STD_INSTALL_CMAKE_DIR})
+ install(EXPORT kokkos
+ FILE KokkosDeprecatedTargets.cmake
+ DESTINATION ${INSTALL_CMAKE_DIR})
+ install(EXPORT kokkos
+ FILE KokkosDeprecatedTargets.cmake
+ DESTINATION ${STD_INSTALL_CMAKE_DIR})
 
  export(TARGETS kokkos
- #NAMESPACE kokkos::
+ NAMESPACE kokkos::
  FILE KokkosTargets.cmake)
 
  SET (Kokkos_LIBRARIES_NAMES kokkos)
 endif() # KOKKOS_SEPARATE_LIBS
 
 include(CMakePackageConfigHelpers)
-configure_package_config_file(cmake/kokkosConfig.cmake.in
- "${Kokkos_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/kokkosConfig.cmake"
+configure_package_config_file(cmake/KokkosConfig.cmake.in
+ "${Kokkos_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/KokkosConfig.cmake"
  INSTALL_DESTINATION ${INSTALL_CMAKE_DIR})
-write_basic_package_version_file("${Kokkos_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/kokkosConfigVersion.cmake"
+write_basic_package_version_file("${Kokkos_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/KokkosConfigVersion.cmake"
  VERSION "${Kokkos_VERSION_MAJOR}.${Kokkos_VERSION_MINOR}.${Kokkos_VERSION_PATCH}"
  COMPATIBILITY SameMajorVersion)
 
 # Install the kokkos headers
 INSTALL (DIRECTORY EXPORT kokkos
- #EXPORT KokkosTargets
  ${Kokkos_SOURCE_DIR}/core/src/
  DESTINATION ${KOKKOS_HEADER_DIR}
  FILES_MATCHING PATTERN "*.hpp"
 )
 INSTALL (DIRECTORY EXPORT kokkos
- #EXPORT KokkosTargets
  ${Kokkos_SOURCE_DIR}/containers/src/
  DESTINATION ${KOKKOS_HEADER_DIR}
  FILES_MATCHING PATTERN "*.hpp"
 )
 INSTALL (DIRECTORY EXPORT kokkos
- #EXPORT KokkosTargets
  ${Kokkos_SOURCE_DIR}/algorithms/src/
  DESTINATION ${KOKKOS_HEADER_DIR}
  FILES_MATCHING PATTERN "*.hpp"
@@ -278,7 +284,7 @@ INSTALL (FILES
 
 # Export the package for use from the build-tree
 # (this registers the build-tree with a global CMake-registry)
-export(PACKAGE kokkos)
+export(PACKAGE Kokkos)
 
 # Create the KokkosConfig.cmake and KokkosConfigVersion files
 #file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}"
@@ -295,10 +301,15 @@ export(PACKAGE kokkos)
 
 # Install the KokkosConfig.cmake and KokkosConfigVersion.cmake
 install(FILES
- "${Kokkos_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/kokkosConfig.cmake"
- "${Kokkos_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/kokkosConfigVersion.cmake"
+ "${Kokkos_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/KokkosConfig.cmake"
+ "${Kokkos_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/KokkosConfigVersion.cmake"
  DESTINATION "${INSTALL_CMAKE_DIR}")
 
+install(FILES
+ "${Kokkos_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/KokkosConfig.cmake"
+ "${Kokkos_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/KokkosConfigVersion.cmake"
+ DESTINATION "${STD_INSTALL_CMAKE_DIR}")
+
 # build and install pkgconfig file
 CONFIGURE_FILE(core/src/kokkos.pc.in kokkos.pc @ONLY)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/kokkos.pc DESTINATION lib/pkgconfig)