27 lines
812 B
Plaintext
27 lines
812 B
Plaintext
$OpenBSD: patch-CMakeLists_txt,v 1.8 2019/05/23 19:24:47 landry Exp $
|
|
Ensure it uses our FindIconv.cmake module
|
|
Index: CMakeLists.txt
|
|
--- CMakeLists.txt.orig
|
|
+++ CMakeLists.txt
|
|
@@ -383,9 +383,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)
|
|
@@ -462,7 +462,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})
|