CMakeLists.txt | 4 +--- config.h.cmake | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-)
New commits: commit 8d051716029f056bf9b395269fb88c7322a3345c Author: Albert Astals Cid <[email protected]> Date: Tue Mar 8 14:53:07 2022 +0100 If you want to build the cpp frontend iconv is required If you don't have iconv, you can set -DENABLE_CPP=OFF on compile time Also remove HAVE_ICONV that is not used anywhere diff --git a/CMakeLists.txt b/CMakeLists.txt index bd3d6280..cd0b502e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -244,9 +244,7 @@ if(ENABLE_GTK_DOC) endif() if(ENABLE_CPP) - macro_optional_find_package(Iconv) - set(ENABLE_CPP ${ICONV_FOUND}) - set(HAVE_ICONV ${ICONV_FOUND}) + find_package(Iconv REQUIRED) endif() if(ENABLE_ZLIB) find_package(ZLIB) diff --git a/config.h.cmake b/config.h.cmake index 00e1445a..ea679a4f 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -70,9 +70,6 @@ /* Defines if timegm is available on your system */ #cmakedefine HAVE_TIMEGM 1 -/* Define if you have the iconv() function and it works. */ -#cmakedefine HAVE_ICONV 1 - /* Define to 1 if you have the `z' library (-lz). */ #cmakedefine HAVE_LIBZ 1
