build: add cmake flags to control platform support

Related-To: NEO-6683 Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
2025-09-15 13:01:45 +08:00 · 2024-06-24 21:04:11 +00:00
parent 0b513fba0d
commit bbe11205e3
18 changed files with 152 additions and 53 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -492,6 +492,34 @@ endif()
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

 # Get available platforms
+if(DEFINED NEO_ALLOW_LEGACY_PLATFORMS_SUPPORT AND NOT DEFINED NEO_LEGACY_PLATFORMS_SUPPORT)
+  set(NEO_LEGACY_PLATFORMS_SUPPORT ${NEO_ALLOW_LEGACY_PLATFORMS_SUPPORT})
+endif()
+if(NOT DEFINED NEO_LEGACY_PLATFORMS_SUPPORT)
+  if(WIN32)
+    set(NEO_LEGACY_PLATFORMS_SUPPORT FALSE)
+  else()
+    set(NEO_LEGACY_PLATFORMS_SUPPORT TRUE)
+  endif()
+endif()
+if(NOT DEFINED NEO_CURRENT_PLATFORMS_SUPPORT)
+  set(NEO_CURRENT_PLATFORMS_SUPPORT TRUE)
+endif()
+if(NEO_LEGACY_PLATFORMS_SUPPORT AND NOT NEO_CURRENT_PLATFORMS_SUPPORT)
+  if(NOT DEFINED NEO_OCLOC_VERSION_MAJOR)
+    message(FATAL_ERROR "NEO_OCLOC_VERSION_MAJOR is not defined")
+  endif()
+  if(NOT DEFINED NEO_OCLOC_VERSION_MINOR)
+    message(FATAL_ERROR "NEO_OCLOC_VERSION_MINOR is not defined")
+  endif()
+  set(NEO__SO_NAME_SUFFIX "-${NEO_OCLOC_VERSION_MAJOR}.${NEO_OCLOC_VERSION_MINOR}")
+endif()
+if(NOT DEFINED NEO_OCLOC_VERSION_MAJOR)
+  set(NEO_OCLOC_VERSION_MAJOR "${NEO_OCL_VERSION_MAJOR}")
+endif()
+if(NOT DEFINED NEO_OCLOC_VERSION_MINOR)
+  set(NEO_OCLOC_VERSION_MINOR "${NEO_OCL_VERSION_MINOR}")
+endif()
 include(platforms.cmake)
 list(LENGTH ALL_PRODUCT_FAMILY_LIST ALL_PRODUCT_FAMILY_LIST_COUNT)
 if(1 EQUAL ${ALL_PRODUCT_FAMILY_LIST_COUNT})
--- a/cmake/setup_platform_flags.cmake
+++ b/cmake/setup_platform_flags.cmake
@ -8,24 +8,24 @@ if(NEO_SKIP_BASE_PLATFORMS)
  return()
 endif()

-if(NOT NEO_ALLOW_LEGACY_PLATFORMS_SUPPORT)
-  if(WIN32)
-    DISABLE_FLAGS_FOR("GEN8" "BDW")
-    DISABLE_FLAGS_FOR("GEN9" "SKL" "KBL" "BXT" "GLK" "CFL")
-    DISABLE_FLAGS_FOR("GEN11" "ICLLP" "LKF" "EHL")
-  else()
-    SET_FLAGS_FOR("GEN8" "BDW")
-    SET_FLAGS_FOR("GEN9" "SKL" "KBL" "BXT" "GLK" "CFL")
-    SET_FLAGS_FOR("GEN11" "ICLLP" "LKF" "EHL")
-  endif()
-else()
+if(NEO_LEGACY_PLATFORMS_SUPPORT)
  SET_FLAGS_FOR("GEN8" "BDW")
  SET_FLAGS_FOR("GEN9" "SKL" "KBL" "BXT" "GLK" "CFL")
  SET_FLAGS_FOR("GEN11" "ICLLP" "LKF" "EHL")
+else()
+  DISABLE_FLAGS_FOR("GEN8" "BDW")
+  DISABLE_FLAGS_FOR("GEN9" "SKL" "KBL" "BXT" "GLK" "CFL")
+  DISABLE_FLAGS_FOR("GEN11" "ICLLP" "LKF" "EHL")
+endif()
+if(NEO_CURRENT_PLATFORMS_SUPPORT)
+  SET_FLAGS_FOR("GEN12LP" "TGLLP" "RKL" "ADLS" "ADLP" "DG1" "ADLN")
+  SET_FLAGS_FOR("XE_HPG_CORE" "DG2" "MTL" "ARL")
+  SET_FLAGS_FOR("XE_HPC_CORE" "PVC")
+else()
+  DISABLE_FLAGS_FOR("GEN12LP" "TGLLP" "RKL" "ADLS" "ADLP" "DG1" "ADLN")
+  DISABLE_FLAGS_FOR("XE_HPG_CORE" "DG2" "MTL" "ARL")
+  DISABLE_FLAGS_FOR("XE_HPC_CORE" "PVC")
 endif()
-SET_FLAGS_FOR("GEN12LP" "TGLLP" "RKL" "ADLS" "ADLP" "DG1" "ADLN")
-SET_FLAGS_FOR("XE_HPG_CORE" "DG2" "MTL" "ARL")
-SET_FLAGS_FOR("XE_HPC_CORE" "PVC")
 DISABLE_WDDM_LINUX_FOR("XE_HPC_CORE" "PVC")

 foreach(CORE_TYPE ${XEHP_AND_LATER_CORE_TYPES})
--- a/level_zero/CMakeLists.txt
+++ b/level_zero/CMakeLists.txt
@ -272,12 +272,6 @@ if(BUILD_WITH_L0)
      message(STATUS "Setting L0 Resource Info")
      target_sources(${TARGET_NAME_L0} PRIVATE ${L0_DLL_RC_FILE})
    endif()
-    set_target_properties(${TARGET_NAME_L0} PROPERTIES
-                          DEBUG_OUTPUT_NAME "${TARGET_NAME_L0}${NEO_BITS}"
-                          RELEASE_OUTPUT_NAME "${TARGET_NAME_L0}${NEO_BITS}"
-                          RELEASEINTERNAL_OUTPUT_NAME "${TARGET_NAME_L0}${NEO_BITS}"
-                          OUTPUT_NAME "${TARGET_NAME_L0}${NEO_BITS}"
-    )
    add_dependencies(${TARGET_NAME_L0} ${GMM_TARGET_NAME})
  else()
    target_sources(${TARGET_NAME_L0}
@ -301,6 +295,13 @@ if(BUILD_WITH_L0)
    endif()
  endif()

+  set_target_properties(${TARGET_NAME_L0} PROPERTIES
+                        DEBUG_OUTPUT_NAME "${TARGET_NAME_L0}${IGDRCL_OPTION__BITS}${NEO__SO_NAME_SUFFIX}"
+                        RELEASE_OUTPUT_NAME "${TARGET_NAME_L0}${IGDRCL_OPTION__BITS}${NEO__SO_NAME_SUFFIX}"
+                        RELEASEINTERNAL_OUTPUT_NAME "${TARGET_NAME_L0}${IGDRCL_OPTION__BITS}${NEO__SO_NAME_SUFFIX}"
+                        OUTPUT_NAME "${TARGET_NAME_L0}${IGDRCL_OPTION__BITS}${NEO__SO_NAME_SUFFIX}"
+  )
+
  if(DEFINED AUB_STREAM_PROJECT_NAME)
    target_sources(${TARGET_NAME_L0}
                   PRIVATE
--- a/level_zero/core/test/black_box_tests/CMakeLists.txt
+++ b/level_zero/core/test/black_box_tests/CMakeLists.txt
@ -110,7 +110,6 @@ foreach(TEST_NAME ${TEST_TARGETS})
                        VS_DEBUGGER_WORKING_DIRECTORY "${TargetDir}"
  )

-  add_dependencies(${TEST_NAME} ${TARGET_NAME_L0})
  target_link_libraries(${TEST_NAME} PUBLIC ${TARGET_NAME_L0})

  set_target_properties(${TEST_NAME} PROPERTIES FOLDER ${L0_BLACK_BOX_TEST_PROJECT_FOLDER})
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@ -31,7 +31,7 @@ components:
    branch: master
    dest_dir: infra
    fetch_tags: true
-    revision: v6085
+    revision: v6093
    type: git
  internal:
    branch: master
--- a/opencl/source/CMakeLists.txt
+++ b/opencl/source/CMakeLists.txt
@ -198,10 +198,10 @@ if(${GENERATE_EXECUTABLE})
  endif()

  set_target_properties(${NEO_DYNAMIC_LIB_NAME} PROPERTIES
-                        DEBUG_OUTPUT_NAME "${NEO_DLL_NAME_BASE}${IGDRCL_NAME_POSTFIX}${IGDRCL_OPTION__BITS}"
-                        RELEASE_OUTPUT_NAME "${NEO_DLL_NAME_BASE}${IGDRCL_NAME_POSTFIX}${IGDRCL_OPTION__BITS}"
-                        RELEASEINTERNAL_OUTPUT_NAME "${NEO_DLL_NAME_BASE}${IGDRCL_NAME_POSTFIX}${IGDRCL_OPTION__BITS}"
-                        OUTPUT_NAME "${NEO_DLL_NAME_BASE}${IGDRCL_NAME_POSTFIX}${IGDRCL_OPTION__BITS}"
+                        DEBUG_OUTPUT_NAME "${NEO_DLL_NAME_BASE}${IGDRCL_NAME_POSTFIX}${IGDRCL_OPTION__BITS}${NEO__SO_NAME_SUFFIX}"
+                        RELEASE_OUTPUT_NAME "${NEO_DLL_NAME_BASE}${IGDRCL_NAME_POSTFIX}${IGDRCL_OPTION__BITS}${NEO__SO_NAME_SUFFIX}"
+                        RELEASEINTERNAL_OUTPUT_NAME "${NEO_DLL_NAME_BASE}${IGDRCL_NAME_POSTFIX}${IGDRCL_OPTION__BITS}${NEO__SO_NAME_SUFFIX}"
+                        OUTPUT_NAME "${NEO_DLL_NAME_BASE}${IGDRCL_NAME_POSTFIX}${IGDRCL_OPTION__BITS}${NEO__SO_NAME_SUFFIX}"
  )
  set_target_properties(${NEO_DYNAMIC_LIB_NAME} PROPERTIES FOLDER ${OPENCL_RUNTIME_PROJECTS_FOLDER})
  create_project_source_tree_with_exports(${NEO_DYNAMIC_LIB_NAME} "${EXPORTS_FILENAME}")
--- a/package.cmake
+++ b/package.cmake
@ -53,16 +53,18 @@ if(UNIX)
  endif()

  if(NEO_BUILD_WITH_OCL)
+    set(NEO_OCL_ICD_FILE_NAME "intel${NEO__SO_NAME_SUFFIX}.icd")
+
    get_target_property(OCL_RUNTIME_LIB_NAME igdrcl_dll OUTPUT_NAME)
    install(
-            CODE "file( WRITE ${NEO_BINARY_DIR}/intel.icd \"${CMAKE_INSTALL_FULL_LIBDIR}/intel-opencl/${CMAKE_SHARED_LIBRARY_PREFIX}${OCL_RUNTIME_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\n\" )"
+            CODE "file( WRITE ${NEO_BINARY_DIR}/${NEO_OCL_ICD_FILE_NAME} \"${CMAKE_INSTALL_FULL_LIBDIR}/intel-opencl/${CMAKE_SHARED_LIBRARY_PREFIX}${OCL_RUNTIME_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\n\" )"
            CODE "file( WRITE ${NEO_BINARY_DIR}/tmp/postinst \"/sbin/ldconfig\n\" )"
            CODE "file( WRITE ${NEO_BINARY_DIR}/tmp/postrm \"/sbin/ldconfig\n\" )"
            CODE "file( COPY ${NEO_BINARY_DIR}/tmp/postinst DESTINATION ${NEO_BINARY_DIR} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )"
            CODE "file( COPY ${NEO_BINARY_DIR}/tmp/postrm DESTINATION ${NEO_BINARY_DIR} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )"
            COMPONENT opencl
    )
-    install(FILES ${NEO_BINARY_DIR}/intel.icd DESTINATION ${OCL_ICD_VENDORDIR} COMPONENT opencl)
+    install(FILES ${NEO_BINARY_DIR}/${NEO_OCL_ICD_FILE_NAME} DESTINATION ${OCL_ICD_VENDORDIR} COMPONENT opencl)
  endif()

  if(NEO_BUILD_DEBUG_SYMBOLS_PACKAGE)
--- a/scripts/packaging/l0_gpu_driver/sles_15/SPECS/l0_gpu_driver.spec
+++ b/scripts/packaging/l0_gpu_driver/sles_15/SPECS/l0_gpu_driver.spec
@ -96,12 +96,12 @@ cd build
 #Remove OpenCL files
 rm -rvf %{buildroot}%{_libdir}/intel-opencl/
 rm -rvf %{buildroot}%{_sysconfdir}/OpenCL/
-rm -rvf %{buildroot}%{_bindir}/ocloc
-rm -rvf %{buildroot}%{_libdir}/libocloc.so
+rm -rvf %{buildroot}%{_bindir}/ocloc*
+rm -rvf %{buildroot}%{_libdir}/libocloc*.so
 rm -rvf %{buildroot}%{_includedir}/ocloc_api.h
 #Remove debug files
-rm -vf %{buildroot}/%{_libdir}/intel-opencl/libigdrcl.so.debug
-rm -vf %{buildroot}/%{_libdir}/libocloc.so.debug
+rm -vf %{buildroot}/%{_libdir}/intel-opencl/libigdrcl*.so.debug
+rm -vf %{buildroot}/%{_libdir}/libocloc*.so.debug
 rm -rvf %{buildroot}/usr/lib/debug/
 #insert license into package
 mkdir -p %{buildroot}/usr/share/doc/intel-level-zero-gpu%{?name_suffix}/
@ -113,7 +113,7 @@ fi

 %files -n intel-level-zero-gpu%{?name_suffix}
 %defattr(-,root,root)
-%{_libdir}/libze_intel_gpu.so.*
+%{_libdir}/libze_intel_gpu*.so.*
 /usr/share/doc/intel-level-zero-gpu%{?name_suffix}/copyright
 %config(noreplace)

--- a/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/intel-level-zero-gpu.install
+++ b/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/intel-level-zero-gpu.install
@ -1 +1 @@
-usr/lib/*/libze_intel_gpu.so.*
+usr/lib/*/libze_intel_gpu*.so.*
--- a/scripts/packaging/opencl/build_opencl_deb.sh
+++ b/scripts/packaging/opencl/build_opencl_deb.sh
@ -15,6 +15,8 @@ BUILD_DIR="${REPO_DIR}/../build_opencl"
 NEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS:-FALSE}
 NEO_SKIP_AUB_TESTS_RUN=${NEO_SKIP_AUB_TESTS_RUN:-TRUE}
 NEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION:-FALSE}
+NEO_LEGACY_PLATFORMS_SUPPORT=${NEO_LEGACY_PLATFORMS_SUPPORT:-TRUE}
+NEO_CURRENT_PLATFORMS_SUPPORT=${NEO_CURRENT_PLATFORMS_SUPPORT:-TRUE}
 SPEC_FILE="${SPEC_FILE:-${OS_TYPE}}"

 BRANCH_SUFFIX="$( cat ${REPO_DIR}/.branch )"
@ -86,6 +88,23 @@ if [ -z "${BRANCH_SUFFIX}" ]; then
    fi
 fi

+echo "NEO_CURRENT_PLATFORMS_SUPPORT: ${NEO_CURRENT_PLATFORMS_SUPPORT}"
+echo "NEO_LEGACY_PLATFORMS_SUPPORT: ${NEO_LEGACY_PLATFORMS_SUPPORT}"
+
+if [[ "${NEO_LEGACY_PLATFORMS_SUPPORT}" == "TRUE" ]] && [[ ! "${NEO_CURRENT_PLATFORMS_SUPPORT}" == "TRUE" ]]; then
+    echo "Building Legacy package"
+    export NEO_OCLOC_VERSION_MAJOR=24
+    export NEO_OCLOC_VERSION_MINOR=22
+    perl -pi -e "s/^Package: intel-opencl-icd$/Package: intel-opencl-icd-${NEO_OCLOC_VERSION_MAJOR}-${NEO_OCLOC_VERSION_MINOR}/" "$BUILD_DIR/debian/control"
+else
+    echo "Building Current/Full package"
+    export NEO_OCLOC_VERSION_MAJOR=${NEO_OCL_VERSION_MAJOR}
+    export NEO_OCLOC_VERSION_MINOR=${NEO_OCL_VERSION_MINOR}
+fi
+
+perl -pi -e "s/\/ocloc 0$/\/ocloc-${NEO_OCLOC_VERSION_MAJOR}.${NEO_OCLOC_VERSION_MINOR} ${NEO_OCLOC_VERSION_MAJOR}${NEO_OCLOC_VERSION_MINOR}/" "$BUILD_DIR/debian/postinst"
+perl -pi -e "s/\/ocloc$/\/ocloc-${NEO_OCLOC_VERSION_MAJOR}.${NEO_OCLOC_VERSION_MINOR}/" "$BUILD_DIR/debian/prerm"
+
 #needs a top level CMAKE file
 cat << EOF | tee $BUILD_DIR/CMakeLists.txt
 cmake_minimum_required (VERSION 3.13.0 FATAL_ERROR)
--- a/scripts/packaging/opencl/sles_15/SPECS/opencl.spec
+++ b/scripts/packaging/opencl/sles_15/SPECS/opencl.spec
@ -86,9 +86,8 @@ Summary:        ocloc package for opencl
 cd build
 %ninja_install

-chmod +x %{buildroot}/%{_libdir}/intel-opencl/libigdrcl.so
-rm -vf %{buildroot}/%{_libdir}/intel-opencl/libigdrcl.so.debug
-rm -vf %{buildroot}/%{_libdir}/libocloc.so.debug
+rm -vf %{buildroot}/%{_libdir}/intel-opencl/libigdrcl*.so.debug
+rm -vf %{buildroot}/%{_libdir}/libocloc*.so.debug
 rm -rvf %{buildroot}/usr/lib/debug/

 #insert license into package
@ -104,16 +103,25 @@ fi
 %files -n intel-opencl%{?name_suffix}
 %defattr(-,root,root)
 %{_sysconfdir}/OpenCL
-%{_libdir}/intel-opencl/libigdrcl.so
+%{_libdir}/intel-opencl/libigdrcl*.so
 /usr/share/doc/intel-opencl%{?name_suffix}/copyright

 %files -n intel-ocloc%{?name_suffix}
 %defattr(-,root,root)
-%{_bindir}/ocloc
-%{_libdir}/libocloc.so
+%{_bindir}/ocloc*
+%{_libdir}/libocloc*.so
 %{_includedir}/ocloc_api.h
 /usr/share/doc/intel-ocloc%{?name_suffix}/copyright

+%post -n intel-ocloc%{?name_suffix}
+update-alternatives --quiet --install /usr/bin/ocloc ocloc /usr/bin/ocloc-%{NEO_OCL_VERSION_MAJOR}.%{NEO_OCL_VERSION_MINOR} %{NEO_OCL_VERSION_MAJOR}%{NEO_OCL_VERSION_MINOR}
+
+%preun -n intel-ocloc%{?name_suffix}
+if [ $1 == "0" ]; then
+    # uninstall
+    update-alternatives --quiet --remove ocloc /usr/bin/ocloc-%{NEO_OCL_VERSION_MAJOR}.%{NEO_OCL_VERSION_MINOR}
+fi
+
 %changelog
 * Mon Sep 13 2021 Compute-Runtime-Automation <compute-runtime@intel.com>
 - Initial spec file for SLES 15.3
--- a/scripts/packaging/opencl/ubuntu_20.04/debian/postinst
+++ b/scripts/packaging/opencl/ubuntu_20.04/debian/postinst
@ -0,0 +1,12 @@
+#! /bin/sh -e
+
+#
+# Copyright (C) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+update-alternatives --quiet \
+    --install /usr/bin/ocloc ocloc /usr/bin/ocloc 0
+
+exit 0
--- a/scripts/packaging/opencl/ubuntu_20.04/debian/prerm
+++ b/scripts/packaging/opencl/ubuntu_20.04/debian/prerm
@ -0,0 +1,14 @@
+#! /bin/sh -e
+
+#
+# Copyright (C) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+if [ $1 != "upgrade" ]; then
+    update-alternatives --quiet --remove ocloc /usr/bin/ocloc
+fi
+
+exit 0
+
--- a/scripts/packaging/opencl/ubuntu_20.04/debian/rules
+++ b/scripts/packaging/opencl/ubuntu_20.04/debian/rules
@ -11,15 +11,23 @@ NEO_SKIP_AUB_TESTS_RUN ?= TRUE
 NEO_ENABLE_i915_PRELIM_DETECTION ?= TRUE
 NEO_ENABLE_XE_EU_DEBUG_SUPPORT ?= FALSE
 NEO_FORCE_USE_AUB_STREAM ?= TRUE
+NEO_LEGACY_PLATFORMS_SUPPORT ?= TRUE
+NEO_CURRENT_PLATFORMS_SUPPORT ?= TRUE
+NEO_OCLOC_VERSION_MAJOR ?= ${NEO_OCL_VERSION_MAJOR}
+NEO_OCLOC_VERSION_MINOR ?= ${NEO_OCL_VERSION_MINOR}

 override_dh_auto_configure:
 	dh_auto_configure -- ${NEO_BUILD_EXTRA_OPTS} \
 		-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
 		-DNEO_OCL_VERSION_MAJOR=${NEO_OCL_VERSION_MAJOR} \
 		-DNEO_OCL_VERSION_MINOR=${NEO_OCL_VERSION_MINOR} \
+		-DNEO_OCLOC_VERSION_MAJOR=${NEO_OCLOC_VERSION_MAJOR} \
+		-DNEO_OCLOC_VERSION_MINOR=${NEO_OCLOC_VERSION_MINOR} \
 		-DNEO_VERSION_BUILD=${NEO_OCL_VERSION_BUILD} \
 		-DNEO_SKIP_AUB_TESTS_RUN=${NEO_SKIP_AUB_TESTS_RUN} \
 		-DNEO_SKIP_UNIT_TESTS=${NEO_SKIP_UNIT_TESTS} \
+		-DNEO_LEGACY_PLATFORMS_SUPPORT=${NEO_LEGACY_PLATFORMS_SUPPORT} \
+		-DNEO_CURRENT_PLATFORMS_SUPPORT=${NEO_CURRENT_PLATFORMS_SUPPORT} \
 		-DNEO_ENABLE_i915_PRELIM_DETECTION=${NEO_ENABLE_i915_PRELIM_DETECTION} \
 		-DNEO_ENABLE_XE_EU_DEBUG_SUPPORT=${NEO_ENABLE_XE_EU_DEBUG_SUPPORT} \
 		-DNEO_DISABLE_BUILTINS_COMPILATION=${NEO_DISABLE_BUILTINS_COMPILATION} \
--- a/scripts/packaging/ubuntu/debian/intel-ocloc.install
+++ b/scripts/packaging/ubuntu/debian/intel-ocloc.install
@ -1,2 +1,2 @@
-usr/lib/*/libocloc.so
-usr/bin/ocloc
+usr/lib/*/libocloc*.so
+usr/bin/ocloc*
--- a/scripts/packaging/ubuntu/debian/intel-opencl-icd.install
+++ b/scripts/packaging/ubuntu/debian/intel-opencl-icd.install
@ -1,2 +1,2 @@
-etc/OpenCL/vendors/intel.icd
-usr/lib/x86_64-linux-gnu/intel-opencl/libigdrcl.so
+etc/OpenCL/vendors/intel*.icd
+usr/lib/x86_64-linux-gnu/intel-opencl/libigdrcl*.so
--- a/scripts/packaging/ubuntu/debian/libze-intel-gpu1.install
+++ b/scripts/packaging/ubuntu/debian/libze-intel-gpu1.install
@ -1 +1 @@
-usr/lib/*/libze_intel_gpu.so.*
+usr/lib/*/libze_intel_gpu*.so.*
--- a/shared/offline_compiler/source/CMakeLists.txt
+++ b/shared/offline_compiler/source/CMakeLists.txt
@ -321,7 +321,6 @@ set(CLOC_LIB_SRCS
    ${NEO_SHARED_DIRECTORY}/helpers/file_io_load.cpp
 )
 add_library(${OCLOC_NAME}_lib SHARED ${CLOC_LIB_SRCS})
-
 add_subdirectories()

 create_project_source_tree(${OCLOC_NAME}_lib)
@ -416,11 +415,14 @@ if(UNIX)
          PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
          COMPONENT ${OCLOC_NAME}
  )
-  install(FILES ${OCLOC_DIRECTORY}/source/ocloc_api.h
-          DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-          PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
-          COMPONENT ${OCLOC_NAME}
-  )
+
+  if(NEO_CURRENT_PLATFORMS_SUPPORT)
+    install(FILES ${OCLOC_DIRECTORY}/source/ocloc_api.h
+            DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+            PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+            COMPONENT ${OCLOC_NAME}
+    )
+  endif()
 elseif(WIN32)
  if(NEO_WINDOWS_INSTALL)
    install(TARGETS ${OCLOC_NAME}
@ -438,8 +440,14 @@ elseif(WIN32)
  endif()
 endif()

-set(OCLOC_OUTPUT_NAME "${OCLOC_NAME}${OCLOC_BITNESS_SUFFIX}")
-set_target_properties(${OCLOC_NAME}_lib PROPERTIES OUTPUT_NAME ${OCLOC_OUTPUT_NAME})
+if(WIN32)
+  set(LIBOCLOC_OUTPUT_NAME_SUFFIX ${OCLOC_BITNESS_SUFFIX})
+elseif(UNIX)
+  set(OCLOC_OUTPUT_NAME_SUFFIX "-${NEO_OCLOC_VERSION_MAJOR}.${NEO_OCLOC_VERSION_MINOR}")
+  set(LIBOCLOC_OUTPUT_NAME_SUFFIX "-${NEO_OCLOC_VERSION_MAJOR}.${NEO_OCLOC_VERSION_MINOR}")
+endif()
+set_target_properties(${OCLOC_NAME} PROPERTIES OUTPUT_NAME ${OCLOC_NAME}${OCLOC_OUTPUT_NAME_SUFFIX})
+set_target_properties(${OCLOC_NAME}_lib PROPERTIES OUTPUT_NAME ${OCLOC_NAME}${LIBOCLOC_OUTPUT_NAME_SUFFIX})

 add_custom_target(copy_compiler_files DEPENDS ${NEO__IGC_TARGETS})
 set_target_properties(copy_compiler_files PROPERTIES FOLDER ${OCLOC_FOLDER_NAME})