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