blob: 103565ff1e4f1e96fb8f832d888d77307792e6dd (
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
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
diff -r --unified a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt
--- a/src-IL/CMakeLists.txt 2023-02-26 22:14:14.468289653 +0100
+++ b/src-IL/CMakeLists.txt 2023-02-26 22:39:57.848451049 +0100
@@ -2,6 +2,7 @@
project(DevIL)
include (TestBigEndian)
+include (GNUInstallDirs)
option(BUILD_SHARED_LIBS "Build with shared (.DLL .SO) libraries." ON)
@@ -311,11 +312,11 @@
# Installation
install (TARGETS IL
- ARCHIVE DESTINATION lib
- LIBRARY DESTINATION lib
- RUNTIME DESTINATION bin
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
-install (FILES ../include/IL/il.h DESTINATION include/IL)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/IL/il.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/IL)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/IL.pc
diff -r --unified a/DevIL/src-ILU/CMakeLists.txt b/DevIL/src-ILU/CMakeLists.txt
--- a/src-ILU/CMakeLists.txt 2023-02-26 22:40:01.657478195 +0100
+++ b/src-ILU/CMakeLists.txt 2023-02-26 22:42:30.253560617 +0100
@@ -2,6 +2,8 @@
project(ILU)
+include (GNUInstallDirs)
+
file(GLOB ILU_SRCS src/*.cpp)
file(GLOB ILU_INC include/*.h ../include/IL/devil_internal_exports.h ../include/IL/ilu.h)
file(GLOB ILU_RSRC)
@@ -75,11 +77,11 @@
# Installation
install (TARGETS ILU
- ARCHIVE DESTINATION lib
- LIBRARY DESTINATION lib
- RUNTIME DESTINATION bin
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
-install (FILES ../include/IL/ilu.h DESTINATION include/IL)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/IL/ilu.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/IL)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/ILU.pc
diff -r --unified a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt
--- a/src-ILUT/CMakeLists.txt 2023-02-26 22:40:01.657478195 +0100
+++ b/src-ILUT/CMakeLists.txt 2023-02-26 22:43:27.677989601 +0100
@@ -2,6 +2,8 @@
project(ILUT)
+include (GNUInstallDirs)
+
file(GLOB ILUT_SRCS src/*.cpp)
file(GLOB ILUT_INC include/*.h ../include/IL/devil_internal_exports.h ../include/IL/ilut.h)
file(GLOB ILUT_RSRC)
@@ -95,11 +97,11 @@
# Installation
install (TARGETS ILUT
- ARCHIVE DESTINATION lib
- LIBRARY DESTINATION lib
- RUNTIME DESTINATION bin
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
-install (FILES ../include/IL/ilut.h DESTINATION include/IL)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/IL/ilut.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/IL)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/ILUT.pc
|
GitWeb