107 lines
4.1 KiB
Diff
107 lines
4.1 KiB
Diff
--- a/CMakeLists.txt 2025-03-04 11:03:17.565212068 +0200
|
|
+++ b/CMakeLists.txt 2025-03-04 11:04:19.363015019 +0200
|
|
@@ -168,10 +168,10 @@
|
|
endif()
|
|
|
|
include(cmake/extra_modules.cmake)
|
|
-add_subdirectory(docs)
|
|
-add_subdirectory(tools)
|
|
-add_subdirectory(scripts)
|
|
-add_subdirectory(licensing)
|
|
+#add_subdirectory(docs)
|
|
+#add_subdirectory(tools)
|
|
+#add_subdirectory(scripts)
|
|
+#add_subdirectory(licensing)
|
|
|
|
if(ENABLE_TESTS)
|
|
# layers and other more high-level / e2e tests
|
|
--- a/cmake/developer_package/packaging/archive.cmake 2024-11-21 09:41:13.107605950 +0200
|
|
+++ b/cmake/developer_package/packaging/archive.cmake 2024-11-21 11:00:50.406807366 +0200
|
|
@@ -25,14 +25,17 @@
|
|
macro(ov_archive_cpack_set_dirs)
|
|
# common "archive" package locations
|
|
# TODO: move current variables to OpenVINO specific locations
|
|
- set(OV_CPACK_INCLUDEDIR runtime/include)
|
|
- set(OV_CPACK_OPENVINO_CMAKEDIR runtime/cmake)
|
|
+ set(OV_CPACK_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
|
|
+ set(OV_CPACK_OPENVINO_CMAKEDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/openvino-${OpenVINO_VERSION})
|
|
set(OV_CPACK_DOCDIR docs)
|
|
set(OV_CPACK_LICENSESDIR licenses)
|
|
set(OV_CPACK_SAMPLESDIR samples)
|
|
set(OV_CPACK_WHEELSDIR wheels)
|
|
set(OV_CPACK_DEVREQDIR tools)
|
|
- set(OV_CPACK_PYTHONDIR python)
|
|
+ ov_get_pyversion(pyversion)
|
|
+ if(pyversion)
|
|
+ set(OV_CPACK_PYTHONDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${pyversion}/site-packages)
|
|
+ endif()
|
|
|
|
if(USE_BUILD_TYPE_SUBFOLDER)
|
|
set(build_type ${CMAKE_BUILD_TYPE})
|
|
@@ -49,11 +52,11 @@
|
|
set(OV_CPACK_RUNTIMEDIR runtime/lib/${ARCH_FOLDER}/${build_type})
|
|
set(OV_CPACK_ARCHIVEDIR runtime/lib/${ARCH_FOLDER}/${build_type})
|
|
else()
|
|
- set(OV_CPACK_LIBRARYDIR runtime/lib/${ARCH_FOLDER})
|
|
- set(OV_CPACK_RUNTIMEDIR runtime/lib/${ARCH_FOLDER})
|
|
- set(OV_CPACK_ARCHIVEDIR runtime/lib/${ARCH_FOLDER})
|
|
+ set(OV_CPACK_LIBRARYDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
|
|
+ set(OV_CPACK_RUNTIMEDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
|
|
+ set(OV_CPACK_ARCHIVEDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
|
|
endif()
|
|
- set(OV_CPACK_PLUGINSDIR ${OV_CPACK_RUNTIMEDIR})
|
|
+ set(OV_CPACK_PLUGINSDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/openvino-${OpenVINO_VERSION})
|
|
endmacro()
|
|
|
|
ov_archive_cpack_set_dirs()
|
|
@@ -82,13 +85,13 @@
|
|
unset(OV_CPACK_COMP_C_SAMPLES_EXCLUDE_ALL)
|
|
unset(OV_CPACK_COMP_PYTHON_SAMPLES_EXCLUDE_ALL)
|
|
# python
|
|
- unset(OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL)
|
|
- unset(OV_CPACK_COMP_BENCHMARK_APP_EXCLUDE_ALL)
|
|
- unset(OV_CPACK_COMP_OVC_EXCLUDE_ALL)
|
|
+ set(OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL)
|
|
+ set(OV_CPACK_COMP_BENCHMARK_APP_EXCLUDE_ALL)
|
|
+ set(OV_CPACK_COMP_OVC_EXCLUDE_ALL)
|
|
set(OV_CPACK_COMP_PYTHON_OPENVINO_PACKAGE_EXCLUDE_ALL EXCLUDE_FROM_ALL)
|
|
# we don't need wheels in the distribution packages
|
|
set(OV_CPACK_COMP_PYTHON_WHEELS_EXCLUDE_ALL EXCLUDE_FROM_ALL)
|
|
- unset(OV_CPACK_COMP_OPENVINO_REQ_FILES_EXCLUDE_ALL)
|
|
+ set(OV_CPACK_COMP_OPENVINO_REQ_FILES_EXCLUDE_ALL)
|
|
# nodejs
|
|
set(OV_CPACK_COMP_NPM_EXCLUDE_ALL EXCLUDE_FROM_ALL)
|
|
# scripts
|
|
--- a/cmake/templates/openvino.pc.in 2024-11-21 11:01:17.143817693 +0200
|
|
+++ b/cmake/templates/openvino.pc.in 2024-11-21 11:03:13.731862758 +0200
|
|
@@ -2,13 +2,10 @@
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
#
|
|
|
|
-pc_path=${pcfiledir}
|
|
-prefix=${pc_path}/@PKGCONFIG_OpenVINO_PREFIX@
|
|
-
|
|
-exec_prefix=${prefix}/@OV_CPACK_RUNTIMEDIR@
|
|
+exec_prefix=@OV_CPACK_RUNTIMEDIR@
|
|
libdir=${exec_prefix}
|
|
|
|
-include_prefix=${prefix}/@OV_CPACK_INCLUDEDIR@
|
|
+include_prefix=@OV_CPACK_INCLUDEDIR@
|
|
includedir=${include_prefix}
|
|
|
|
Name: OpenVINO
|
|
--- a/src/plugins/intel_gpu/CMakeLists.txt 2025-03-17 18:30:04.844696856 +0200
|
|
+++ b/src/plugins/intel_gpu/CMakeLists.txt 2025-03-17 18:30:35.623976711 +0200
|
|
@@ -63,9 +63,9 @@
|
|
add_subdirectory(thirdparty)
|
|
include(thirdparty/cmake/rapidjson.cmake)
|
|
|
|
-if(CMAKE_COMPILER_IS_GNUCXX)
|
|
- ov_add_compiler_flags(-Werror)
|
|
-endif()
|
|
+#if(CMAKE_COMPILER_IS_GNUCXX)
|
|
+# ov_add_compiler_flags(-Werror)
|
|
+#endif()
|
|
|
|
add_subdirectory(src/runtime)
|
|
add_subdirectory(src/kernel_selector)
|