Attachment 13120 Details for Bug 30010 – patch for HeadersCpp

[patch] patch for HeadersCpp

002-Add_CMake_config_for_OCLHeadersCpp.patch (text/plain), 2.61 KB, created by Aurelian R on 2022-02-07 19:44:14 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Aurelian R

Created: 2022-02-07 19:44:14 CET

Size: 2.61 KB

patch

obsolete

>diff -Nurp opencl-headers-3.0-20220119/CMakeLists.txt opencl-headers-3.0-20220119_new/CMakeLists.txt
>--- opencl-headers-3.0-20220119/CMakeLists.txt	2022-02-02 15:02:50.251832924 +0200
>+++ opencl-headers-3.0-20220119_new/CMakeLists.txt	2022-02-02 18:47:40.903182020 +0200
>@@ -15,6 +15,8 @@ include(GNUInstallDirs)
> 
> add_library(Headers INTERFACE)
> add_library(OpenCL::Headers ALIAS Headers)
>+add_library(HeadersCpp INTERFACE)
>+add_library(OpenCL::HeadersCpp ALIAS HeadersCpp)
> 
> if(CMAKE_SYSTEM_NAME MATCHES Darwin)
>   execute_process(
>@@ -38,6 +40,11 @@ else()
>       $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
>       $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
>   )
>+  target_include_directories(HeadersCpp
>+    INTERFACE
>+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
>+      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
>+  )
> endif()
> 
> install(
>@@ -45,6 +52,10 @@ install(
>   EXPORT OpenCLHeadersTargets
> )
> install(
>+  TARGETS HeadersCpp
>+  EXPORT OpenCLHeadersCppTargets
>+)
>+install(
>   DIRECTORY CL
>   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
> )
>@@ -54,10 +65,19 @@ export(
>   FILE ${PROJECT_BINARY_DIR}/OpenCLHeaders/OpenCLHeadersTargets.cmake
>   NAMESPACE OpenCL::
> )
>+export(
>+  EXPORT OpenCLHeadersCppTargets
>+  FILE ${PROJECT_BINARY_DIR}/OpenCLHeadersCpp/OpenCLHeadersCppTargets.cmake
>+  NAMESPACE OpenCL::
>+)
> file(
>   WRITE ${PROJECT_BINARY_DIR}/OpenCLHeaders/OpenCLHeadersConfig.cmake
>   "include(\"\${CMAKE_CURRENT_LIST_DIR}/OpenCLHeadersTargets.cmake\")"
> )
>+file(
>+  WRITE ${PROJECT_BINARY_DIR}/OpenCLHeadersCpp/OpenCLHeadersCppConfig.cmake
>+  "include(\"\${CMAKE_CURRENT_LIST_DIR}/OpenCLHeadersCppTargets.cmake\")"
>+)
> 
> set(config_package_location ${CMAKE_INSTALL_DATADIR}/cmake/OpenCLHeaders)
> install(
>@@ -89,6 +109,31 @@ install(
>     DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig
> )
> 
>+set(VERSION_OCL_CPP "3.0")
>+set(config_package_location ${CMAKE_INSTALL_DATADIR}/cmake/OpenCLHeadersCpp)
>+install(
>+  EXPORT OpenCLHeadersCppTargets
>+  FILE OpenCLHeadersCppTargets.cmake
>+  NAMESPACE OpenCL::
>+  DESTINATION ${config_package_location}
>+)
>+install(
>+  FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenCLHeadersCpp/OpenCLHeadersCppConfig.cmake
>+  DESTINATION ${config_package_location}
>+)
>+
>+include(CMakePackageConfigHelpers)
>+write_basic_package_version_file(
>+  ${CMAKE_CURRENT_BINARY_DIR}/OpenCLHeadersCpp/OpenCLHeadersCppConfigVersion.cmake
>+  VERSION ${VERSION_OCL_CPP}
>+  COMPATIBILITY AnyNewerVersion
>+  ARCH_INDEPENDENT
>+)
>+install(
>+  FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenCLHeadersCpp/OpenCLHeadersCppConfigVersion.cmake
>+  DESTINATION ${config_package_location}
>+)
>+
> if(BUILD_TESTING)
>   include(CTest)
>   add_subdirectory(tests)

diff -Nurp opencl-headers-3.0-20220119/CMakeLists.txt opencl-headers-3.0-20220119_new/CMakeLists.txt
--- opencl-headers-3.0-20220119/CMakeLists.txt	2022-02-02 15:02:50.251832924 +0200
+++ opencl-headers-3.0-20220119_new/CMakeLists.txt	2022-02-02 18:47:40.903182020 +0200
@@ -15,6 +15,8 @@ include(GNUInstallDirs)
 
 add_library(Headers INTERFACE)
 add_library(OpenCL::Headers ALIAS Headers)
+add_library(HeadersCpp INTERFACE)
+add_library(OpenCL::HeadersCpp ALIAS HeadersCpp)
 
 if(CMAKE_SYSTEM_NAME MATCHES Darwin)
   execute_process(
@@ -38,6 +40,11 @@ else()
       $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
       $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
   )
+  target_include_directories(HeadersCpp
+    INTERFACE
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+  )
 endif()
 
 install(
@@ -45,6 +52,10 @@ install(
   EXPORT OpenCLHeadersTargets
 )
 install(
+  TARGETS HeadersCpp
+  EXPORT OpenCLHeadersCppTargets
+)
+install(
   DIRECTORY CL
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
@@ -54,10 +65,19 @@ export(
   FILE ${PROJECT_BINARY_DIR}/OpenCLHeaders/OpenCLHeadersTargets.cmake
   NAMESPACE OpenCL::
 )
+export(
+  EXPORT OpenCLHeadersCppTargets
+  FILE ${PROJECT_BINARY_DIR}/OpenCLHeadersCpp/OpenCLHeadersCppTargets.cmake
+  NAMESPACE OpenCL::
+)
 file(
   WRITE ${PROJECT_BINARY_DIR}/OpenCLHeaders/OpenCLHeadersConfig.cmake
   "include(\"\${CMAKE_CURRENT_LIST_DIR}/OpenCLHeadersTargets.cmake\")"
 )
+file(
+  WRITE ${PROJECT_BINARY_DIR}/OpenCLHeadersCpp/OpenCLHeadersCppConfig.cmake
+  "include(\"\${CMAKE_CURRENT_LIST_DIR}/OpenCLHeadersCppTargets.cmake\")"
+)
 
 set(config_package_location ${CMAKE_INSTALL_DATADIR}/cmake/OpenCLHeaders)
 install(
@@ -89,6 +109,31 @@ install(
     DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig
 )
 
+set(VERSION_OCL_CPP "3.0")
+set(config_package_location ${CMAKE_INSTALL_DATADIR}/cmake/OpenCLHeadersCpp)
+install(
+  EXPORT OpenCLHeadersCppTargets
+  FILE OpenCLHeadersCppTargets.cmake
+  NAMESPACE OpenCL::
+  DESTINATION ${config_package_location}
+)
+install(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenCLHeadersCpp/OpenCLHeadersCppConfig.cmake
+  DESTINATION ${config_package_location}
+)
+
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(
+  ${CMAKE_CURRENT_BINARY_DIR}/OpenCLHeadersCpp/OpenCLHeadersCppConfigVersion.cmake
+  VERSION ${VERSION_OCL_CPP}
+  COMPATIBILITY AnyNewerVersion
+  ARCH_INDEPENDENT
+)
+install(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenCLHeadersCpp/OpenCLHeadersCppConfigVersion.cmake
+  DESTINATION ${config_package_location}
+)
+
 if(BUILD_TESTING)
   include(CTest)
   add_subdirectory(tests)

Actions: View | Diff

Attachments on bug 30010: 13117 | 13118 | 13119 | 13120 | 13121 | 13122 | 13123 | 13124