]>
Commit | Line | Data |
---|---|---|
05e8614e AM |
1 | From: "Matteo F. Vescovi" <mfv.debian@gmail.com> |
2 | Date: Fri, 21 Dec 2012 16:34:56 +0100 | |
3 | Subject: Fix_multiarch_paths | |
4 | ||
5 | This second patch adds multiarch paths to the | |
6 | standard ones for ilm and openexr libraries. | |
7 | --- | |
8 | src/cmake/modules/FindIlmBase.cmake | 2 ++ | |
9 | src/cmake/modules/FindOpenEXR.cmake | 2 ++ | |
10 | 2 files changed, 4 insertions(+) | |
11 | ||
12 | diff --git a/src/cmake/modules/FindIlmBase.cmake b/src/cmake/modules/FindIlmBase.cmake | |
13 | index 9e2fe5b..041b470 100644 | |
14 | --- a/src/cmake/modules/FindIlmBase.cmake | |
15 | +++ b/src/cmake/modules/FindIlmBase.cmake | |
16 | @@ -118,7 +118,9 @@ set (IlmBase_generic_include_paths | |
17 | /opt/local/include) | |
18 | set (IlmBase_generic_library_paths | |
19 | /usr/lib | |
20 | + /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} | |
21 | /usr/local/lib | |
22 | + /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE} | |
23 | /sw/lib | |
24 | /opt/local/lib) | |
25 | ||
26 | diff --git a/src/cmake/modules/FindOpenEXR.cmake b/src/cmake/modules/FindOpenEXR.cmake | |
27 | index bd37e8a..955c025 100644 | |
28 | --- a/src/cmake/modules/FindOpenEXR.cmake | |
29 | +++ b/src/cmake/modules/FindOpenEXR.cmake | |
30 | @@ -114,7 +114,9 @@ set (OpenEXR_generic_include_paths | |
31 | /opt/local/include) | |
32 | set (OpenEXR_generic_library_paths | |
33 | /usr/lib | |
34 | + /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} | |
35 | /usr/local/lib | |
36 | + /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE} | |
37 | /sw/lib | |
38 | /opt/local/lib) | |
39 |