]>
Commit | Line | Data |
---|---|---|
1e59de90 TL |
1 | --- a/cmake/modules/FindLCMS2.cmake 2016-11-02 07:09:50.000000000 +0100 |
2 | +++ b/cmake/modules/FindLCMS2.cmake 2018-06-02 00:43:27.309100600 +0200 | |
3 | @@ -13,7 +13,6 @@ | |
4 | # Redistribution and use is allowed according to the terms of the BSD license. | |
5 | # For details see the accompanying LICENSE file. | |
6 | ||
7 | - | |
8 | # use pkg-config to get the directories and then use these values | |
9 | # in the FIND_PATH() and FIND_LIBRARY() calls | |
10 | if(NOT WIN32) | |
11 | @@ -29,18 +28,30 @@ | |
12 | PATH_SUFFIXES lcms2 liblcms2 | |
13 | ) | |
14 | ||
15 | -find_library(LCMS2_LIBRARIES NAMES lcms2 liblcms2 lcms-2 liblcms-2 | |
16 | +include(SelectLibraryConfigurations) | |
17 | + | |
18 | +find_library(LCMS2_LIBRARY_RELEASE NAMES lcms2 liblcms2 lcms-2 liblcms-2 | |
19 | + PATHS | |
20 | + ${PC_LCMS2_LIBDIR} | |
21 | + ${PC_LCMS2_LIBRARY_DIRS} | |
22 | + PATH_SUFFIXES lcms2 | |
23 | +) | |
24 | + | |
25 | +find_library(LCMS2_LIBRARY_DEBUG NAMES lcms2d liblcms2d lcms-2d liblcms-2d | |
26 | PATHS | |
27 | ${PC_LCMS2_LIBDIR} | |
28 | ${PC_LCMS2_LIBRARY_DIRS} | |
29 | PATH_SUFFIXES lcms2 | |
30 | ) | |
31 | ||
32 | -if(LCMS2_INCLUDE_DIR AND LCMS2_LIBRARIES) | |
33 | +select_library_configurations(LCMS2) | |
34 | + | |
35 | + | |
36 | +if(LCMS2_INCLUDE_DIR AND LCMS2_LIBRARY) | |
37 | set(LCMS2_FOUND TRUE) | |
38 | -else(LCMS2_INCLUDE_DIR AND LCMS2_LIBRARIES) | |
39 | +else(LCMS2_INCLUDE_DIR AND LCMS2_LIBRARY) | |
40 | set(LCMS2_FOUND FALSE) | |
41 | -endif(LCMS2_INCLUDE_DIR AND LCMS2_LIBRARIES) | |
42 | +endif(LCMS2_INCLUDE_DIR AND LCMS2_LIBRARY) | |
43 | ||
44 | if(LCMS2_FOUND) | |
45 | file(READ ${LCMS2_INCLUDE_DIR}/lcms2.h LCMS2_VERSION_CONTENT) | |
46 | @@ -50,11 +61,11 @@ | |
47 | if(NOT LCMS2_FIND_QUIETLY) | |
48 | string(SUBSTRING ${LCMS2_VERSION} 0 1 LCMS2_MAJOR_VERSION) | |
49 | string(SUBSTRING ${LCMS2_VERSION} 1 2 LCMS2_MINOR_VERSION) | |
50 | - message(STATUS "Found lcms version ${LCMS2_MAJOR_VERSION}.${LCMS2_MINOR_VERSION}, ${LCMS2_LIBRARIES}") | |
51 | + message(STATUS "Found lcms version ${LCMS2_MAJOR_VERSION}.${LCMS2_MINOR_VERSION}, ${LCMS2_LIBRARY}") | |
52 | endif(NOT LCMS2_FIND_QUIETLY) | |
53 | else(LCMS2_VERSION_MATCH) | |
54 | if(NOT LCMS2_FIND_QUIETLY) | |
55 | - message(STATUS "Found lcms2 but failed to find version ${LCMS2_LIBRARIES}") | |
56 | + message(STATUS "Found lcms2 but failed to find version ${LCMS2_LIBRARY}") | |
57 | endif(NOT LCMS2_FIND_QUIETLY) | |
58 | set(LCMS2_VERSION NOTFOUND) | |
59 | endif(LCMS2_VERSION_MATCH) | |
60 | @@ -68,5 +79,5 @@ | |
61 | endif(NOT LCMS2_FIND_QUIETLY) | |
62 | endif(LCMS2_FOUND) | |
63 | ||
64 | -mark_as_advanced(LCMS2_INCLUDE_DIR LCMS2_LIBRARIES LCMS2_VERSION) | |
65 | +mark_as_advanced(LCMS2_INCLUDE_DIR LCMS2_LIBRARY LCMS2_VERSION) | |
66 |