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