diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2020-04-07 22:26:00 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-04-10 11:29:22 +0800 |
commit | ec5c324ae8f1e7b3da574267d4533c758a3ecfcf (patch) | |
tree | 2e5d95c85a16fe780121051cba994eb56eb8e1e6 /recipes-devtools/ngraph/ngraph/0001-install-cmake-modules-correctly.patch | |
parent | e0a8e6e48ff741c3a1eff39876c4185fc5d22601 (diff) | |
download | meta-intel-ec5c324ae8f1e7b3da574267d4533c758a3ecfcf.tar.gz |
ngraph: upgrade 0.22.1 -> 2.29.0-rc0
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-devtools/ngraph/ngraph/0001-install-cmake-modules-correctly.patch')
-rw-r--r-- | recipes-devtools/ngraph/ngraph/0001-install-cmake-modules-correctly.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/recipes-devtools/ngraph/ngraph/0001-install-cmake-modules-correctly.patch b/recipes-devtools/ngraph/ngraph/0001-install-cmake-modules-correctly.patch new file mode 100644 index 00000000..c8e5095f --- /dev/null +++ b/recipes-devtools/ngraph/ngraph/0001-install-cmake-modules-correctly.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | From a03058ed605345cce9d7f0cd98f7c3696c3d7c51 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Tue, 7 Apr 2020 13:44:37 +0800 | ||
4 | Subject: [PATCH] fix installation of cmake modules | ||
5 | |||
6 | Make sure that cmake files are installed correctly and don't install | ||
7 | license files. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | CMakeLists.txt | 14 ++++---------- | ||
14 | 1 file changed, 4 insertions(+), 10 deletions(-) | ||
15 | |||
16 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
17 | index 604daa0e45..b60a013b86 100644 | ||
18 | --- a/CMakeLists.txt | ||
19 | +++ b/CMakeLists.txt | ||
20 | @@ -667,12 +667,12 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | ||
21 | install(EXPORT ngraphTargets | ||
22 | FILE ngraphTargets.cmake | ||
23 | NAMESPACE ngraph:: | ||
24 | - DESTINATION cmake | ||
25 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | ||
26 | COMPONENT ngraph) | ||
27 | |||
28 | configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/share/ngraphConfig.cmake.in | ||
29 | ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake | ||
30 | - INSTALL_DESTINATION cmake) | ||
31 | + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph) | ||
32 | |||
33 | write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake | ||
34 | VERSION ${NGRAPH_VERSION} | ||
35 | @@ -680,14 +680,8 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) | ||
36 | |||
37 | install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake | ||
38 | ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake | ||
39 | - DESTINATION cmake | ||
40 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | ||
41 | COMPONENT ngraph) | ||
42 | endif() | ||
43 | |||
44 | -install(DIRECTORY | ||
45 | - ${CMAKE_CURRENT_SOURCE_DIR}/licenses | ||
46 | - DESTINATION "." | ||
47 | - COMPONENT ngraph | ||
48 | -) | ||
49 | -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION "." COMPONENT ngraph) | ||
50 | -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION "." COMPONENT ngraph) | ||
51 | +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ngraph COMPONENT ngraph) | ||
52 | -- | ||
53 | 2.25.2 | ||
54 | |||