| 123456789101112131415161718192021222324252627 |
- $OpenBSD: patch-CMakeLists_txt,v 1.6 2017/05/15 10:02:01 landry Exp $
- Ensure it uses our FindIconv.cmake module
- Index: CMakeLists.txt
- --- CMakeLists.txt.orig
- +++ CMakeLists.txt
- @@ -346,9 +346,9 @@ find_package(Freetype)
- if(NOT FREETYPE_FOUND)
- report_mandatory_not_found(FREETYPE)
- endif(NOT FREETYPE_FOUND)
- -include_directories(${FREETYPE_INCLUDE_DIR})
- +include_directories(${FREETYPE_INCLUDE_DIRS})
- ms_link_libraries( ${FREETYPE_LIBRARY})
- -list(APPEND ALL_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR})
- +list(APPEND ALL_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS})
-
-
- if(WITH_PROJ)
- @@ -419,7 +419,7 @@ endif( USE_FRIBIDI AND NOT(USE_HARFBUZZ) )
-
-
- if(WITH_ICONV)
- - find_package(ICONV)
- + find_package(Iconv)
- if(ICONV_FOUND)
- include_directories(${ICONV_INCLUDE_DIR})
- ms_link_libraries( ${ICONV_LIBRARY})
|
