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
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
diff -Naur nvidia-texture-tools-2.1.2.orig/CMakeLists.txt nvidia-texture-tools-2.1.2/CMakeLists.txt
--- nvidia-texture-tools-2.1.2.orig/CMakeLists.txt 2020-08-24 08:27:21.000000000 +0200
+++ nvidia-texture-tools-2.1.2/CMakeLists.txt 2020-09-04 18:10:04.297646679 +0200
@@ -28,12 +28,6 @@
ADD_SUBDIRECTORY(src)
-# These files should only be installed when creating packages.
-INSTALL(FILES
- LICENSE
- README.md
- DESTINATION share/doc/nvtt)
-
# Add packaging support
INCLUDE(InstallRequiredSystemLibraries)
diff -Naur nvidia-texture-tools-2.1.2.orig/extern/libsquish-1.15/CMakeLists.txt nvidia-texture-tools-2.1.2/extern/libsquish-1.15/CMakeLists.txt
--- nvidia-texture-tools-2.1.2.orig/extern/libsquish-1.15/CMakeLists.txt 2020-08-24 08:27:21.000000000 +0200
+++ nvidia-texture-tools-2.1.2/extern/libsquish-1.15/CMakeLists.txt 2020-09-04 18:09:45.861623060 +0200
@@ -111,7 +111,7 @@
INSTALL(
TARGETS squish
- LIBRARY DESTINATION lib
+ LIBRARY DESTINATION ${LIBDIR}
ARCHIVE DESTINATION lib
PUBLIC_HEADER DESTINATION include
)
diff -Naur nvidia-texture-tools-2.1.2.orig/src/nvcore/CMakeLists.txt nvidia-texture-tools-2.1.2/src/nvcore/CMakeLists.txt
--- nvidia-texture-tools-2.1.2.orig/src/nvcore/CMakeLists.txt 2020-08-24 08:27:21.000000000 +0200
+++ nvidia-texture-tools-2.1.2/src/nvcore/CMakeLists.txt 2020-09-04 18:09:45.860623059 +0200
@@ -45,6 +45,6 @@
endif()
INSTALL(TARGETS nvcore
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib/static)
+ RUNTIME DESTINATION ${BINDIR}
+ LIBRARY DESTINATION ${LIBDIR}
+ ARCHIVE DESTINATION ${LIBDIR})
diff -Naur nvidia-texture-tools-2.1.2.orig/src/nvimage/CMakeLists.txt nvidia-texture-tools-2.1.2/src/nvimage/CMakeLists.txt
--- nvidia-texture-tools-2.1.2.orig/src/nvimage/CMakeLists.txt 2020-08-24 08:27:21.000000000 +0200
+++ nvidia-texture-tools-2.1.2/src/nvimage/CMakeLists.txt 2020-09-04 18:09:45.860623059 +0200
@@ -57,7 +57,7 @@
TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore posh bc6h bc7 nvmath)
INSTALL(TARGETS nvimage
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib/static)
+ RUNTIME DESTINATION ${BINDIR}
+ LIBRARY DESTINATION ${LIBDIR}
+ ARCHIVE DESTINATION ${LIBDIR})
diff -Naur nvidia-texture-tools-2.1.2.orig/src/nvmath/CMakeLists.txt nvidia-texture-tools-2.1.2/src/nvmath/CMakeLists.txt
--- nvidia-texture-tools-2.1.2.orig/src/nvmath/CMakeLists.txt 2020-08-24 08:27:21.000000000 +0200
+++ nvidia-texture-tools-2.1.2/src/nvmath/CMakeLists.txt 2020-09-04 18:09:45.860623059 +0200
@@ -19,6 +19,6 @@
TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvcore)
INSTALL(TARGETS nvmath
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib/static)
+ RUNTIME DESTINATION ${BINDIR}
+ LIBRARY DESTINATION ${LIBDIR}
+ ARCHIVE DESTINATION ${LIBDIR})
diff -Naur nvidia-texture-tools-2.1.2.orig/src/nvthread/CMakeLists.txt nvidia-texture-tools-2.1.2/src/nvthread/CMakeLists.txt
--- nvidia-texture-tools-2.1.2.orig/src/nvthread/CMakeLists.txt 2020-08-24 08:27:21.000000000 +0200
+++ nvidia-texture-tools-2.1.2/src/nvthread/CMakeLists.txt 2020-09-04 18:09:45.860623059 +0200
@@ -23,6 +23,6 @@
TARGET_LINK_LIBRARIES(nvthread ${LIBS} nvcore)
INSTALL(TARGETS nvthread
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib/static)
+ RUNTIME DESTINATION ${BINDIR}
+ LIBRARY DESTINATION ${LIBDIR}
+ ARCHIVE DESTINATION ${LIBDIR})
diff -Naur nvidia-texture-tools-2.1.2.orig/src/nvtt/CMakeLists.txt nvidia-texture-tools-2.1.2/src/nvtt/CMakeLists.txt
--- nvidia-texture-tools-2.1.2.orig/src/nvtt/CMakeLists.txt 2020-08-24 08:27:21.000000000 +0200
+++ nvidia-texture-tools-2.1.2/src/nvtt/CMakeLists.txt 2020-09-04 18:09:45.860623059 +0200
@@ -56,9 +56,9 @@
TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvimage nvthread nvsquish bc6h bc7 nvmath rg_etc1)
INSTALL(TARGETS nvtt
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib/static)
+ RUNTIME DESTINATION ${BINDIR}
+ LIBRARY DESTINATION ${LIBDIR}
+ ARCHIVE DESTINATION ${LIBDIR})
INSTALL(FILES nvtt.h nvtt_wrapper.h DESTINATION include/nvtt)
|
GitWeb