Do not build and install libOpenCL. --- b/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,9 +15,9 @@ option(FILE_REORG_BACKWARD_COMPATIBILITY "Enable File Reorganization backward co set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_LIST_DIR}/khronos/headers/opencl2.2" CACHE PATH "") -add_subdirectory(khronos/icd) +#add_subdirectory(khronos/icd) add_subdirectory(amdocl) add_subdirectory(tools/clinfo) add_subdirectory(tools/cltrace) if(BUILD_TESTS) add_subdirectory(tests/ocltst) @@ -25,16 +25,6 @@ endif() ###--- Packaging ------------------------------------------------------------### -# DEV package -install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL" - DESTINATION include - COMPONENT DEV - USE_SOURCE_PERMISSIONS - PATTERN cl_d3d10.h EXCLUDE - PATTERN cl_d3d11.h EXCLUDE - PATTERN cl_dx9_media_sharing.h EXCLUDE - PATTERN cl_egl.h EXCLUDE) - ############################# # Packaging steps ############################# @@ -53,8 +43,8 @@ if (DEFINED ROCM_PATCH_VERSION) set(OPENCL_AMD_ICD_FILE "amdocl64_${ROCM_PATCH_VERSION}.icd") endif() -get_target_property(OPENCL_LIB_VERSION_MAJOR OpenCL SOVERSION) -get_target_property(OPENCL_LIB_VERSION_STRING OpenCL VERSION) +#get_target_property(OPENCL_LIB_VERSION_MAJOR OpenCL SOVERSION) +#get_target_property(OPENCL_LIB_VERSION_STRING OpenCL VERSION) #Set Package Version set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) diff --git a/khronos/icd/CMakeLists.txt b/khronos/icd/CMakeLists.txt index 4bafa86..987dd6f 100644 --- a/khronos/icd/CMakeLists.txt 2020-06-07 16:05:32.425022904 +0200 +++ b/khronos/icd/CMakeLists.txt 2020-06-07 16:06:03.273022786 +0200 @@ -132,7 +132,7 @@ if (BUILD_TESTING) add_subdirectory (test) endif() -install (TARGETS OpenCL - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +#install (TARGETS OpenCL +# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +# ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt index 48353eb..cd1e7c1 100644 --- a/packaging/CMakeLists.txt +++ b/packaging/CMakeLists.txt @@ -17,5 +17,5 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/khronos/headers/opencl2.2/CL PATTERN cl_dx9_media_sharing.h EXCLUDE PATTERN cl_egl.h EXCLUDE ) -install(TARGETS OpenCL DESTINATION lib COMPONENT icd ) +#install(TARGETS OpenCL DESTINATION lib COMPONENT icd ) install(FILES ${CMAKE_SOURCE_DIR}/khronos/icd/LICENSE DESTINATION share/doc/rocm-ocl-icd COMPONENT icd) /tests/web.scm?id=7b9ee58925406f5d608fca06db5479e16970dc91'>tests: Fix tailon test....Mathieu Othacehe 2021-12-10Merge remote-tracking branch 'signed/master' into core-updatesMathieu Othacehe 2021-12-06tests: patchwork: Use the default PostgreSQL....Marius Bakke 2021-11-17Merge branch 'master' into core-updates-frozenLudovic Courtès 2021-11-15gnu: hpcguix-web: Update to 0.2.0....Ludovic Courtès 2021-09-26tests: Reduce boilerplate for users of 'system-test-runner'....Ludovic Courtès 2021-09-25tests: Adjust to SRFI-64 as found in Guile 3.0.7....Ludovic Courtès 2021-06-01tests: hpcguix-web: Fix it....Mathieu Othacehe 2021-04-18tests: Increase VM memory size....Mathieu Othacehe 2021-04-18tests: patchwork: Fix it....Mathieu Othacehe 2021-04-12services: postgresql: Change service default socket directory....Christopher Baines 2021-01-28services: postgresql: Add socket directory support....Mathieu Othacehe 2020-10-20services: databases: Don't specify a default postgresql version....Christopher Baines 2020-07-13gnu: tests: Fix unbound variable....Julien Lepiller 2020-04-21tests: web: Explicitly wait for the HTTP port....Ludovic Courtès