]>
Commit | Line | Data |
---|---|---|
550c3aa5 | 1 | --- DevIL/DevIL/src-IL/CMakeLists.txt.orig 2017-01-02 01:03:56.000000000 +0100 |
68f7077d JB |
2 | +++ DevIL/DevIL/src-IL/CMakeLists.txt 2023-03-25 10:36:16.647374199 +0100 |
3 | @@ -58,6 +58,7 @@ source_group("Text Files" FILES ${DevIL_ | |
550c3aa5 JB |
4 | |
5 | if(BUILD_SHARED_LIBS) | |
6 | add_library(IL SHARED ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT}) | |
7 | + set_target_properties(IL PROPERTIES SOVERSION 1 VERSION 1.8.0) | |
8 | else(BUILD_SHARED_LIBS) | |
9 | add_library(IL ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT}) | |
10 | endif(BUILD_SHARED_LIBS) | |
68f7077d | 11 | @@ -248,14 +249,14 @@ configure_file( pkgconfig/IL.pc.cmake.in |
550c3aa5 JB |
12 | |
13 | # Installation | |
14 | install (TARGETS IL | |
15 | - ARCHIVE DESTINATION lib | |
16 | - LIBRARY DESTINATION lib | |
17 | + ARCHIVE DESTINATION lib${LIB_SUFFIX} | |
18 | + LIBRARY DESTINATION lib${LIB_SUFFIX} | |
19 | RUNTIME DESTINATION bin | |
20 | ) | |
21 | install (FILES ../include/IL/il.h DESTINATION include/IL) | |
22 | ||
23 | install(FILES | |
24 | ${CMAKE_CURRENT_BINARY_DIR}/IL.pc | |
25 | - DESTINATION lib/pkgconfig | |
26 | + DESTINATION lib${LIB_SUFFIX}/pkgconfig | |
27 | ) | |
28 | ||
29 | --- DevIL/DevIL/src-ILU/CMakeLists.txt.orig 2017-01-02 01:03:56.000000000 +0100 | |
68f7077d JB |
30 | +++ DevIL/DevIL/src-ILU/CMakeLists.txt 2023-03-25 10:36:31.683959406 +0100 |
31 | @@ -44,6 +44,7 @@ source_group("Resource Files" FILES ${IL | |
550c3aa5 JB |
32 | |
33 | # Remove SHARED to create a static library | |
34 | add_library(ILU SHARED ${ILU_SRCS} ${ILU_INC} ${ILU_RSRC}) | |
35 | +set_target_properties(ILU PROPERTIES SOVERSION 1 VERSION 1.8.0) | |
36 | ||
37 | ||
38 | ## ILU requires IL | |
68f7077d | 39 | @@ -74,14 +75,17 @@ endif(UNICODE) |
550c3aa5 JB |
40 | |
41 | # Installation | |
42 | install (TARGETS ILU | |
43 | - ARCHIVE DESTINATION lib | |
44 | - LIBRARY DESTINATION lib | |
45 | + ARCHIVE DESTINATION lib${LIB_SUFFIX} | |
46 | + LIBRARY DESTINATION lib${LIB_SUFFIX} | |
47 | RUNTIME DESTINATION bin | |
48 | ) | |
49 | -install (FILES ../include/IL/ilu.h DESTINATION include/IL) | |
50 | +install (FILES ../include/IL/ilu.h ../include/IL/ilu_region.h DESTINATION include/IL) | |
51 | ||
52 | install(FILES | |
53 | ${CMAKE_CURRENT_BINARY_DIR}/ILU.pc | |
54 | - DESTINATION lib/pkgconfig | |
55 | + DESTINATION lib${LIB_SUFFIX}/pkgconfig | |
56 | ) | |
57 | ||
58 | +add_executable(ilur ${CMAKE_CURRENT_SOURCE_DIR}/ilur/ilur.c) | |
59 | +target_link_libraries(ilur ILU IL) | |
60 | +install (TARGETS ilur DESTINATION bin) | |
61 | --- DevIL/DevIL/src-ILUT/CMakeLists.txt.orig 2017-01-02 01:03:56.000000000 +0100 | |
68f7077d JB |
62 | +++ DevIL/DevIL/src-ILUT/CMakeLists.txt 2023-03-25 10:36:46.680544829 +0100 |
63 | @@ -44,6 +44,7 @@ source_group("Resource Files" FILES ${IL | |
550c3aa5 JB |
64 | |
65 | # Remove SHARED to create a static library | |
66 | add_library(ILUT SHARED ${ILUT_SRCS} ${ILUT_INC} ${ILUT_RSRC}) | |
67 | +set_target_properties(ILUT PROPERTIES SOVERSION 1 VERSION 1.8.0) | |
68 | ||
69 | ## add link sub library info | |
70 | target_link_libraries(ILUT | |
68f7077d | 71 | @@ -72,14 +73,14 @@ endif(UNICODE) |
550c3aa5 JB |
72 | |
73 | # Installation | |
74 | install (TARGETS ILUT | |
75 | - ARCHIVE DESTINATION lib | |
76 | - LIBRARY DESTINATION lib | |
77 | + ARCHIVE DESTINATION lib${LIB_SUFFIX} | |
78 | + LIBRARY DESTINATION lib${LIB_SUFFIX} | |
79 | RUNTIME DESTINATION bin | |
80 | ) | |
81 | -install (FILES ../include/IL/ilut.h DESTINATION include/IL) | |
82 | +install (FILES ../include/IL/ilut.h ../include/IL/devil_cpp_wrapper.hpp DESTINATION include/IL) | |
83 | ||
84 | install(FILES | |
85 | ${CMAKE_CURRENT_BINARY_DIR}/ILUT.pc | |
86 | - DESTINATION lib/pkgconfig | |
87 | + DESTINATION lib${LIB_SUFFIX}/pkgconfig | |
88 | ) | |
89 |