]>
Commit | Line | Data |
---|---|---|
a547a50f JB |
1 | --- CTL-ctl-1.5/lib/IlmImfCtl/CMakeLists.txt.orig 2013-10-22 19:39:04.000000000 +0200 |
2 | +++ CTL-ctl-1.5/lib/IlmImfCtl/CMakeLists.txt 2014-04-06 08:31:55.806391615 +0200 | |
3 | @@ -13,4 +13,4 @@ | |
4 | ||
5 | export( TARGETS IlmImfCtl IlmCtl FILE "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" ) | |
6 | ||
7 | -install( TARGETS IlmImfCtl DESTINATION lib ) | |
8 | +install( TARGETS IlmImfCtl DESTINATION lib${LIB_SUFFIX} ) | |
9 | --- CTL-ctl-1.5/lib/IlmCtl/CMakeLists.txt.orig 2013-10-22 19:39:04.000000000 +0200 | |
10 | +++ CTL-ctl-1.5/lib/IlmCtl/CMakeLists.txt 2014-04-06 08:32:32.226390855 +0200 | |
11 | @@ -50,4 +50,4 @@ | |
12 | CtlVersion.h | |
13 | DESTINATION include/CTL ) | |
14 | ||
15 | -install( TARGETS IlmCtl DESTINATION lib ) | |
16 | +install( TARGETS IlmCtl DESTINATION lib${LIB_SUFFIX} ) | |
17 | --- CTL-ctl-1.5/lib/IlmCtlMath/CMakeLists.txt.orig 2013-10-22 19:39:04.000000000 +0200 | |
18 | +++ CTL-ctl-1.5/lib/IlmCtlMath/CMakeLists.txt 2014-04-06 08:32:50.143057151 +0200 | |
19 | @@ -20,6 +20,6 @@ | |
20 | CtlSparseMatrix.h | |
21 | DESTINATION include/CTL ) | |
22 | ||
23 | -install( TARGETS IlmCtlMath DESTINATION lib ) | |
24 | +install( TARGETS IlmCtlMath DESTINATION lib${LIB_SUFFIX} ) | |
25 | ||
26 | # TODO Add Imath and Iex libadd dependency and version info | |
27 | --- CTL-ctl-1.5/lib/IlmCtlSimd/CMakeLists.txt.orig 2013-10-22 19:39:04.000000000 +0200 | |
28 | +++ CTL-ctl-1.5/lib/IlmCtlSimd/CMakeLists.txt 2014-04-06 08:33:07.246390126 +0200 | |
29 | @@ -42,4 +42,4 @@ | |
30 | ||
31 | install( FILES CtlSimdInterpreter.h DESTINATION include/CTL ) | |
32 | ||
33 | -install( TARGETS IlmCtlSimd DESTINATION lib ) | |
34 | +install( TARGETS IlmCtlSimd DESTINATION lib${LIB_SUFFIX} ) | |
35 | --- CTL-ctl-1.5/CMakeLists.txt.orig 2013-10-22 19:39:04.000000000 +0200 | |
36 | +++ CTL-ctl-1.5/CMakeLists.txt 2014-04-06 08:35:26.706387222 +0200 | |
37 | @@ -77,7 +77,7 @@ | |
38 | ||
39 | if ( PKG_CONFIG_FOUND ) | |
40 | configure_file(config/CTL.pc.in "${PROJECT_BINARY_DIR}/CTL.pc" @ONLY) | |
41 | -install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev ) | |
42 | +install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig COMPONENT dev ) | |
43 | endif() | |
44 | ||
45 | install( FILES | |
d0461190 JB |
46 | --- CTL-ctl-1.5/OpenEXR_CTL/CMakeLists.txt.orig 2013-10-22 19:39:04.000000000 +0200 |
47 | +++ CTL-ctl-1.5/OpenEXR_CTL/CMakeLists.txt 2014-04-07 03:33:22.116802754 +0200 | |
48 | @@ -13,7 +13,7 @@ | |
49 | ||
50 | if ( PKG_CONFIG_FOUND ) | |
51 | configure_file(../config/OpenEXR_CTL.pc.in "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" @ONLY) | |
52 | -install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev ) | |
53 | +install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig COMPONENT dev ) | |
54 | endif() | |
55 | ||
56 | # TODO CMake config | |
57 | --- CTL-ctl-1.5/lib/IlmCtl/CtlInterpreter.cpp.orig 2013-10-22 19:39:04.000000000 +0200 | |
58 | +++ CTL-ctl-1.5/lib/IlmCtl/CtlInterpreter.cpp 2014-04-07 17:43:14.157354004 +0200 | |
59 | @@ -128,8 +128,7 @@ | |
60 | #if defined (WIN32) || defined (WIN64) | |
61 | path = "."; // default windows install location? | |
62 | #else | |
63 | - path = ".:/usr/local/lib/CTL:/usr/local/" PACKAGE | |
64 | - "-" VERSION "/lib/CTL"; | |
65 | + path = ".:/usr/share/CTL"; | |
66 | #endif | |
67 | ||
68 | size_t pos = 0; | |
69 | --- CTL-ctl-1.5/OpenEXR_CTL/CtlModules/CMakeLists.txt.orig 2013-10-22 19:39:04.000000000 +0200 | |
70 | +++ CTL-ctl-1.5/OpenEXR_CTL/CtlModules/CMakeLists.txt 2014-04-07 17:47:19.351452055 +0200 | |
71 | @@ -2,6 +2,6 @@ | |
72 | FILES | |
73 | utilities.ctl | |
74 | DESTINATION | |
75 | - ${INSTALL_LIB_DIR}/CTL | |
76 | + share/CTL | |
77 | ) | |
78 | ||
79 | --- CTL-ctl-1.5/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt.orig 2013-10-22 19:39:04.000000000 +0200 | |
80 | +++ CTL-ctl-1.5/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt 2014-04-07 17:47:40.999069082 +0200 | |
81 | @@ -22,4 +22,4 @@ | |
82 | ||
83 | install( TARGETS exr_ctl_exr DESTINATION ${INSTALL_BIN_DIR} ) | |
84 | ||
85 | -install( FILES change_saturation.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL ) | |
86 | +install( FILES change_saturation.ctl DESTINATION share/CTL ) | |
87 | --- CTL-ctl-1.5/OpenEXR_CTL/exrdpx/CMakeLists.txt.orig 2013-10-22 19:39:04.000000000 +0200 | |
88 | +++ CTL-ctl-1.5/OpenEXR_CTL/exrdpx/CMakeLists.txt 2014-04-07 17:48:14.727216452 +0200 | |
89 | @@ -22,6 +22,6 @@ | |
90 | ||
91 | install( TARGETS exrdpx DESTINATION ${INSTALL_BIN_DIR} ) | |
92 | ||
93 | -install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL ) | |
94 | +install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION share/CTL ) | |
95 | ||
96 |