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
|
Title: Multiarch support
DEP: 3
Last-Update: 2012-01-07
Author: Lennart Weller <lhw@ring0.de>
Forwarded: not-needed
Abstract:
Added multiarch support. This change is debian specific and
was not forwarded.
diff --git a/src/nvcore/CMakeLists.txt b/src/nvcore/CMakeLists.txt
index 50ace0f..6bb7e4d 100644
--- a/src/nvcore/CMakeLists.txt
+++ b/src/nvcore/CMakeLists.txt
@@ -46,5 +46,5 @@ SET_TARGET_PROPERTIES(nvcore PROPERTIES
INSTALL(TARGETS nvcore
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib/static)
+ LIBRARY DESTINATION ${LIB_DIR_PATH}
+ ARCHIVE DESTINATION ${LIB_DIR_PATH}/static)
diff --git a/src/nvimage/CMakeLists.txt b/src/nvimage/CMakeLists.txt
index bfcb576..b15ce65 100644
--- a/src/nvimage/CMakeLists.txt
+++ b/src/nvimage/CMakeLists.txt
@@ -66,6 +66,6 @@ SET_TARGET_PROPERTIES(nvimage PROPERTIES
INSTALL(TARGETS nvimage
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib/static)
+ LIBRARY DESTINATION ${LIB_DIR_PATH}
+ ARCHIVE DESTINATION ${LIB_DIR_PATH}/static)
diff --git a/src/nvmath/CMakeLists.txt b/src/nvmath/CMakeLists.txt
index 5e42733..54060fb 100644
--- a/src/nvmath/CMakeLists.txt
+++ b/src/nvmath/CMakeLists.txt
@@ -32,5 +32,5 @@ SET_TARGET_PROPERTIES(nvmath PROPERTIES
INSTALL(TARGETS nvmath
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib/static)
+ LIBRARY DESTINATION ${LIB_DIR_PATH}
+ ARCHIVE DESTINATION ${LIB_DIR_PATH}/static)
diff --git a/src/nvtt/CMakeLists.txt b/src/nvtt/CMakeLists.txt
index 1be4200..b676946 100644
--- a/src/nvtt/CMakeLists.txt
+++ b/src/nvtt/CMakeLists.txt
@@ -57,8 +57,8 @@ SET_TARGET_PROPERTIES(nvtt PROPERTIES
INSTALL(TARGETS nvtt
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib/static)
+ LIBRARY DESTINATION ${LIB_DIR_PATH}
+ ARCHIVE DESTINATION ${LIB_DIR_PATH}/static)
INSTALL(FILES nvtt.h DESTINATION include/nvtt)
|
