Skip to content

Commit 3f7382a

Browse files
amielczapszymich
amielcza
authored and
pszymich
committed
Package rename
Rename generated packages (cherry picked from commit d83c03d)
1 parent b26755e commit 3f7382a

File tree

6 files changed

+25
-31
lines changed

6 files changed

+25
-31
lines changed

‎IGC/BiFModule/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ if(UNIX)
4444
install(FILES $<TARGET_FILE:opencl-clang-lib> DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl)
4545
install(FILES $<TARGET_SONAME_FILE:opencl-clang-lib> DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl)
4646

47+
4748
# Get header opencl-c.h directory
4849
get_filename_component(opencl-headers-dir ${opencl-header} DIRECTORY)
4950

‎IGC/CMakeLists.txt‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2139,9 +2139,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/AdaptorOCL/igc-opencl.pc.in ${IGC_BUI
21392139
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/AdaptorOCL/ocl_igc_interface/impl/version_in.h ${IGC_BUILD__IGC_BIN_DIR}/AdaptorOCL/ocl_igc_interface/impl/version.h)
21402140

21412141
if(UNIX)
2142-
install(TARGETS ${IGC_BUILD__PROJ__igc_dll} LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-core)
2142+
install(TARGETS ${IGC_BUILD__PROJ__igc_dll} LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-core NAMELINK_SKIP)
21432143
if (FCL_ENABLED)
2144-
install(TARGETS ${IGC_BUILD__PROJ__fcl_dll} LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl)
2144+
install(TARGETS ${IGC_BUILD__PROJ__fcl_dll} LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl NAMELINK_SKIP)
21452145
endif()
21462146
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AdaptorOCL/ocl_igc_shared DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/igc COMPONENT igc-opencl-devel)
21472147
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AdaptorOCL/ocl_igc_interface DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/igc COMPONENT igc-opencl-devel)
@@ -2168,7 +2168,7 @@ if(UNIX)
21682168
install(FILES ${IGC_BUILD__IGC_BIN_DIR}/AdaptorOCL/igc-opencl.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig COMPONENT igc-opencl-devel)
21692169
install(FILES ${IGC_BUILD__IGC_BIN_DIR}/AdaptorOCL/igc.opencl.h DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/igc COMPONENT igc-opencl-devel)
21702170
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../NOTICES.txt)
2171-
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../NOTICES.txt DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/igc COMPONENT igc-core)
2171+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../NOTICES.txt DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/igc2 COMPONENT igc-core)
21722172
endif()
21732173
install(FILES ${IGC_BUILD__VISA_DIR}/include/RelocationInfo.h DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/visa COMPONENT igc-opencl-devel)
21742174
install(DIRECTORY ${IGC_BUILD__VISA_DIR}/iga/IGALibrary/api/ DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/iga COMPONENT igc-opencl-devel FILES_MATCHING PATTERN "*.h*")
@@ -2229,7 +2229,7 @@ if(UNIX)
22292229
endif()
22302230
endif()
22312231

2232-
# Architecture-related options
2232+
# Architecture-related options
22332233
if("${IGC_OPTION__ARCHITECTURE_TARGET}" STREQUAL "LinuxARM")
22342234
set(CPACK_PACKAGE_ARCHITECTURE "arm64")
22352235
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "arm64")
@@ -2255,25 +2255,25 @@ if(UNIX)
22552255
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
22562256
set(CPACK_RPM_PACKAGE_RELOCATABLE TRUE)
22572257

2258-
set(CPACK_DEBIAN_IGC-CORE_FILE_NAME "intel-igc-core_${PACKAGE_VERSION_WTH_METADATA}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
2259-
set(CPACK_DEBIAN_IGC-MEDIA_FILE_NAME "intel-igc-media_${PACKAGE_VERSION_WTH_METADATA}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
2260-
set(CPACK_DEBIAN_IGC-MEDIA_PACKAGE_DEPENDS "intel-igc-core(=${CPACK_PACKAGE_VERSION})")
2261-
set(CPACK_DEBIAN_IGC-OPENCL_FILE_NAME "intel-igc-opencl_${PACKAGE_VERSION_WTH_METADATA}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
2262-
set(CPACK_DEBIAN_IGC-OPENCL_PACKAGE_DEPENDS "intel-igc-core(=${CPACK_PACKAGE_VERSION})")
2258+
2259+
set(CPACK_DEBIAN_IGC-CORE_FILE_NAME "intel-igc-core-2_${PACKAGE_VERSION_WTH_METADATA}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
2260+
set(CPACK_DEBIAN_IGC-CORE_PACKAGE_NAME "intel-igc-core-2")
2261+
set(CPACK_DEBIAN_IGC-OPENCL_FILE_NAME "intel-igc-opencl-2_${PACKAGE_VERSION_WTH_METADATA}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
2262+
set(CPACK_DEBIAN_IGC-OPENCL_PACKAGE_NAME "intel-igc-opencl-2")
2263+
set(CPACK_DEBIAN_IGC-OPENCL_PACKAGE_DEPENDS "intel-igc-core-2(=${CPACK_PACKAGE_VERSION})")
22632264
set(CPACK_DEBIAN_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel_${PACKAGE_VERSION_WTH_METADATA}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
2264-
set(CPACK_DEBIAN_IGC-OPENCL-DEVEL_PACKAGE_DEPENDS "intel-igc-opencl(=${CPACK_PACKAGE_VERSION})")
2265+
set(CPACK_DEBIAN_IGC-OPENCL-DEVEL_PACKAGE_DEPENDS "intel-igc-opencl-2(=${CPACK_PACKAGE_VERSION})")
22652266

2266-
set(CPACK_RPM_IGC-CORE_FILE_NAME "intel-igc-core-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
2267-
set(CPACK_RPM_IGC-MEDIA_FILE_NAME "intel-igc-media-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
2268-
set(CPACK_RPM_IGC-MEDIA_PACKAGE_REQUIRES "intel-igc-core = ${CPACK_PACKAGE_VERSION}")
2269-
set(CPACK_RPM_IGC-OPENCL_FILE_NAME "intel-igc-opencl-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
2270-
set(CPACK_RPM_IGC-OPENCL_PACKAGE_REQUIRES "intel-igc-core = ${CPACK_PACKAGE_VERSION}")
2267+
set(CPACK_RPM_IGC-CORE_FILE_NAME "intel-igc-core-2-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
2268+
set(CPACK_RPM_IGC-CORE_PACKAGE_NAME "intel-igc-core-2")
2269+
set(CPACK_RPM_IGC-OPENCL_FILE_NAME "intel-igc-opencl-2-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
2270+
set(CPACK_RPM_IGC-OPENCL_PACKAGE_NAME "intel-igc-opencl-2")
2271+
set(CPACK_RPM_IGC-OPENCL_PACKAGE_REQUIRES "intel-igc-core-2 = ${CPACK_PACKAGE_VERSION}")
22712272
set(CPACK_RPM_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm")
2272-
set(CPACK_RPM_IGC-OPENCL-DEVEL_PACKAGE_REQUIRES "intel-igc-opencl = ${CPACK_PACKAGE_VERSION}}")
2273+
set(CPACK_RPM_IGC-OPENCL-DEVEL_PACKAGE_REQUIRES "intel-igc-opencl-2 = ${CPACK_PACKAGE_VERSION}}")
22732274

2274-
set(CPACK_ARCHIVE_IGC-CORE_FILE_NAME "intel-igc-core-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_PACKAGE_ARCHITECTURE}")
2275-
set(CPACK_ARCHIVE_IGC-MEDIA_FILE_NAME "intel-igc-media-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_PACKAGE_ARCHITECTURE}")
2276-
set(CPACK_ARCHIVE_IGC-OPENCL_FILE_NAME "intel-igc-opencl-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_PACKAGE_ARCHITECTURE}")
2275+
set(CPACK_ARCHIVE_IGC-CORE_FILE_NAME "intel-igc-core-2-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_PACKAGE_ARCHITECTURE}")
2276+
set(CPACK_ARCHIVE_IGC-OPENCL_FILE_NAME "intel-igc-opencl-2-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_PACKAGE_ARCHITECTURE}")
22772277
set(CPACK_ARCHIVE_IGC-OPENCL-DEVEL_FILE_NAME "intel-igc-opencl-devel-${PACKAGE_VERSION_WTH_METADATA}.${CPACK_PACKAGE_ARCHITECTURE}")
22782278

22792279
# Create separate debug symbol packages if the CMake/CPack version in use
@@ -2284,7 +2284,7 @@ if(UNIX)
22842284
set(CPACK_DEB_COMPONENT_INSTALL ON)
22852285
set(CPACK_RPM_COMPONENT_INSTALL ON)
22862286
set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
2287-
set(CPACK_COMPONENTS_ALL igc-core igc-media igc-opencl igc-opencl-devel)
2287+
set(CPACK_COMPONENTS_ALL igc-core igc-opencl igc-opencl-devel)
22882288

22892289
include (CPack)
22902290
endif(UNIX)

‎visa/CMakeLists.txt‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -471,14 +471,7 @@ if (UNIX OR WIN32)
471471
#set up standard defines from the common WDK path.
472472
bs_set_wdk(GenX_IR_Exe)
473473
endif()
474-
if(CMAKE_SIZEOF_VOID_P EQUAL 8) #Install only for 64bit
475-
# Install GENX_IR binary or not
476-
# -DINSTALL_GENX_IR=ON could be used to turn this option on.
477-
option(INSTALL_GENX_IR "install GENX_IR or not" ON)
478-
if (UNIX AND INSTALL_GENX_IR)
479-
install(TARGETS GenX_IR_Exe RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT igc-media)
480-
endif ()
481-
endif()
474+
482475

483476
endif(UNIX OR WIN32)
484477

‎visa/FC_linker/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ if (MSVC)
7474
DESTINATION ../Test_Tools/Debug/x64/Standalones CONFIGURATIONS Debug)
7575
endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
7676
elseif (UNIX)
77-
install(TARGETS FC_EXE RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT igc-media)
77+
install(TARGETS FC_EXE RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT igc-opencl-devel)
7878
endif (MSVC)
7979

8080
set_target_properties(FC_EXE PROPERTIES

‎visa/iga/IGAExe/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ if(IGC_BUILD)
111111
COMMAND "${CMAKE_COMMAND}" -E copy $<TARGET_PDB_FILE:IGA_EXE> $<TARGET_FILE_DIR:IGA_DLL>
112112
)
113113
elseif (UNIX)
114-
install(TARGETS IGA_EXE RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT igc-media)
114+
install(TARGETS IGA_EXE RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT igc-opencl-devel)
115115
endif (MSVC)
116116
else()
117117
INSTALL(TARGETS IGA_EXE

‎visa/iga/IGALibrary/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ endif(ANDROID AND MEDIA_IGA)
394394
else()
395395
set(IGA_LIB_PATH ${CMAKE_INSTALL_PREFIX}/lib)
396396
endif()
397-
INSTALL(TARGETS IGA_DLL LIBRARY DESTINATION ${IGA_LIB_PATH} COMPONENT igc-core)
397+
INSTALL(TARGETS IGA_DLL LIBRARY DESTINATION ${IGA_LIB_PATH} COMPONENT igc-core NAMELINK_SKIP)
398398
unset(IGA_LIB_PATH)
399399
elseif(MSVC)
400400
install(TARGETS IGA_DLL RUNTIME

0 commit comments

Comments
 (0)