Skip to content

Commit 85b7256

Browse files
generate .zip package with ocloc on Windows
Related-To: NEO-5417 Signed-off-by: Artur Harasimiuk <[email protected]>
1 parent dca33e1 commit 85b7256

File tree

3 files changed

+40
-11
lines changed

3 files changed

+40
-11
lines changed

manifests/manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ components:
1414
infra:
1515
branch: infra
1616
dest_dir: infra
17-
revision: 6ca4868d24ef3aa24efca8efc444a8050d553318
17+
revision: 1d7afe0385e1c41956475d328d38a8d604006291
1818
type: git
1919
internal:
2020
branch: master

package.cmake

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,24 @@
44
# SPDX-License-Identifier: MIT
55
#
66

7+
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
8+
set(CPACK_PACKAGE_ARCHITECTURE "x86_64")
9+
else()
10+
set(CPACK_PACKAGE_ARCHITECTURE "x86")
11+
endif()
12+
set(CPACK_PACKAGE_RELOCATABLE FALSE)
13+
set(CPACK_PACKAGE_NAME "intel")
14+
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Intel(R) Graphics Compute Runtime")
15+
set(CPACK_PACKAGE_VENDOR "Intel")
16+
if(NEO_BUILD_L0_PACKAGE)
17+
set(CPACK_PACKAGE_VERSION_MAJOR ${NEO_L0_VERSION_MAJOR})
18+
set(CPACK_PACKAGE_VERSION_MINOR ${NEO_L0_VERSION_MINOR})
19+
else()
20+
set(CPACK_PACKAGE_VERSION_MAJOR ${NEO_OCL_VERSION_MAJOR})
21+
set(CPACK_PACKAGE_VERSION_MINOR ${NEO_OCL_VERSION_MINOR})
22+
endif()
23+
set(CPACK_PACKAGE_VERSION_PATCH ${NEO_VERSION_BUILD})
24+
725
if(UNIX)
826
set(package_input_dir ${NEO_BINARY_DIR}/packageinput)
927
set(package_output_dir ${NEO_BINARY_DIR}/packages)
@@ -72,14 +90,6 @@ if(UNIX)
7290
endif()
7391

7492
set(CPACK_SET_DESTDIR TRUE)
75-
set(CPACK_PACKAGE_ARCHITECTURE "x86_64")
76-
set(CPACK_PACKAGE_RELOCATABLE FALSE)
77-
set(CPACK_PACKAGE_NAME "intel")
78-
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Intel(R) Graphics Compute Runtime")
79-
set(CPACK_PACKAGE_VENDOR "Intel")
80-
set(CPACK_PACKAGE_VERSION_MAJOR ${NEO_OCL_VERSION_MAJOR})
81-
set(CPACK_PACKAGE_VERSION_MINOR ${NEO_OCL_VERSION_MINOR})
82-
set(CPACK_PACKAGE_VERSION_PATCH ${NEO_VERSION_BUILD})
8393
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
8494
set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "postinst;postrm")
8595
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://01.org/compute-runtime")
@@ -104,8 +114,6 @@ if(UNIX)
104114
get_property(CPACK_COMPONENTS_ALL GLOBAL PROPERTY NEO_OCL_COMPONENTS_LIST)
105115
endif()
106116
if(NEO_BUILD_L0_PACKAGE)
107-
set(CPACK_PACKAGE_VERSION_MAJOR ${NEO_L0_VERSION_MAJOR})
108-
set(CPACK_PACKAGE_VERSION_MINOR ${NEO_L0_VERSION_MINOR})
109117
get_property(CPACK_COMPONENTS_ALL GLOBAL PROPERTY NEO_L0_COMPONENTS_LIST)
110118
endif()
111119
set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
@@ -192,4 +200,10 @@ if(UNIX)
192200
if(__HAS_PARENT)
193201
set(NEO__COMPONENT_NAME "opencl" PARENT_SCOPE)
194202
endif()
203+
elseif(WIN32)
204+
set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
205+
set(CPACK_COMPONENTS_ALL ocloc)
206+
207+
set(CPACK_ARCHIVE_OCLOC_FILE_NAME "ocloc-${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}-${CPACK_PACKAGE_ARCHITECTURE}")
208+
include(CPack)
195209
endif()

shared/offline_compiler/source/CMakeLists.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,21 @@ if(UNIX)
223223
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
224224
COMPONENT ${OCLOC_NAME}
225225
)
226+
elseif(WIN32)
227+
if(NEO_WINDOWS_INSTALL)
228+
install(TARGETS ${OCLOC_NAME}
229+
DESTINATION ${CMAKE_INSTALL_BINDIR}
230+
COMPONENT ocloc
231+
)
232+
install(TARGETS ${OCLOC_NAME}_lib
233+
DESTINATION ${CMAKE_INSTALL_LIBDIR}
234+
COMPONENT ocloc
235+
)
236+
install(FILES ${OCLOC_DIRECTORY}/source/ocloc_api.h
237+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
238+
COMPONENT ocloc
239+
)
240+
endif()
226241
endif()
227242

228243
set(OCLOC_OUTPUT_NAME "${OCLOC_NAME}${OCLOC_BITNESS_SUFFIX}")

0 commit comments

Comments
 (0)