summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia/onevpl/onevpl/0001-cmake-Allow-build-env-to-set-variables.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-multimedia/onevpl/onevpl/0001-cmake-Allow-build-env-to-set-variables.patch')
-rw-r--r--recipes-multimedia/onevpl/onevpl/0001-cmake-Allow-build-env-to-set-variables.patch65
1 files changed, 0 insertions, 65 deletions
diff --git a/recipes-multimedia/onevpl/onevpl/0001-cmake-Allow-build-env-to-set-variables.patch b/recipes-multimedia/onevpl/onevpl/0001-cmake-Allow-build-env-to-set-variables.patch
deleted file mode 100644
index bb867a8..0000000
--- a/recipes-multimedia/onevpl/onevpl/0001-cmake-Allow-build-env-to-set-variables.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1From 79eea3016649aa9e33e564b6971473ac15fa601a Mon Sep 17 00:00:00 2001
2From: Naveen Saini <naveen.kumar.saini@intel.com>
3Date: Tue, 27 Apr 2021 17:09:01 +0800
4Subject: [PATCH] cmake: Allow build env to set variables
5
6Upstream-Status: Inappropriate
7
8Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
9---
10 cmake/oneAPIInstallDirs.cmake | 32 ++++++++++++++++++++++----------
11 1 file changed, 22 insertions(+), 10 deletions(-)
12
13diff --git a/cmake/oneAPIInstallDirs.cmake b/cmake/oneAPIInstallDirs.cmake
14index 184e19b..0773500 100644
15--- a/cmake/oneAPIInstallDirs.cmake
16+++ b/cmake/oneAPIInstallDirs.cmake
17@@ -8,23 +8,35 @@
18 # Set installation directories
19 #
20
21-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
22- set(CMAKE_INSTALL_BINDIR bin32)
23- set(CMAKE_INSTALL_LIBDIR lib32)
24-else()
25- set(CMAKE_INSTALL_BINDIR bin)
26- set(CMAKE_INSTALL_LIBDIR lib)
27+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
28+ set(CMAKE_INSTALL_LIBDIR lib)
29+endif()
30+
31+if(NOT DEFINED CMAKE_INSTALL_BINDIR)
32+ set(CMAKE_INSTALL_BINDIR bin)
33+endif()
34+
35+if(NOT DEFINED CMAKE_INSTALL_ENVDIR)
36+ set(CMAKE_INSTALL_ENVDIR env)
37+endif()
38+
39+if(NOT DEFINED CMAKE_INSTALL_MODDIR)
40+ set(CMAKE_INSTALL_MODDIR modulefiles)
41+endif()
42+
43+if(NOT CMAKE_INSTALL_EXAMPLEDIR)
44+ set(CMAKE_INSTALL_EXAMPLEDIR examples)
45+endif()
46+
47+if(NOT CMAKE_INSTALL_LICENSEDIR)
48+ set(CMAKE_INSTALL_LICENSEDIR licensing)
49 endif()
50
51 set(CMAKE_INSTALL_INCLUDEDIR include)
52 set(CMAKE_INSTALL_DOCDIR documentation)
53-set(CMAKE_INSTALL_ENVDIR env)
54-set(CMAKE_INSTALL_MODDIR modulefiles)
55 set(CMAKE_INSTALL_SYSCHECKDIR sys_check)
56 set(CMAKE_INSTALL_MODFILEDIR modulefiles)
57 set(CMAKE_INSTALL_REDISTDIR redist)
58-set(CMAKE_INSTALL_EXAMPLEDIR examples)
59-set(CMAKE_INSTALL_LICENSEDIR licensing)
60 set(CMAKE_INSTALL_TOOLSDIR tools)
61 set(CMAKE_INSTALL_SYSCONFDIR config)
62 set(CMAKE_INSTALL_SRCDIR src)
63--
642.17.1
65