diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc986fa..717d859 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,96 +1,93 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(krename VERSION "5.0.60")
 
 set(QT5_MIN_VERSION "5.7.0")
 set(KF5_MIN_VERSION "5.18.0")
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules)
 
 include(KDEInstallDirs)
 include(ECMInstallIcons)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(FeatureSummary)
 
 find_package(Qt5 ${QT5_MIN_VERSION} REQUIRED COMPONENTS
     Core
     Widgets
 )
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Completion
     Config
     CoreAddons
     Crash
     I18n
     IconThemes
     ItemViews
     JobWidgets
     JS
     KIO
     Service
     WidgetsAddons
     XmlGui
 )
 
 add_definitions(
     -DQT_DEPRECATED_WARNINGS
     -DQT_DISABLE_DEPRECATED_BEFORE=0x050700
     -DQT_NO_SIGNALS_SLOTS_KEYWORDS
     -DQT_NO_URL_CAST_FROM_STRING
     -DQT_STRICT_ITERATORS
 )
 
 
 # Find KArchive
 find_package(KF5Archive)
 set_package_properties(KF5Archive PROPERTIES
     PURPOSE "Needed for ODF plugin"
     TYPE OPTIONAL)
 
 # Find taglib
 set(TAGLIB_MIN_VERSION "1.5")
 find_package(Taglib ${TAGLIB_MIN_VERSION})
 set_package_properties(Taglib PROPERTIES
     DESCRIPTION "Read and write tags in audio files"
     URL "https://taglib.github.io/"
     TYPE OPTIONAL)
 
 # Find exiv2
 find_package(Exiv2 0.13) # AccessMode was added in 0.13
 set_package_properties(Exiv2 PROPERTIES
     DESCRIPTION "A library to access image metadata"
     URL "http://www.exiv2.org"
     TYPE OPTIONAL)
 
 # Find podofo
 find_package(PoDoFo)
 set_package_properties(PoDoFo PROPERTIES
     DESCRIPTION "A library to access PDF metadata"
     URL "http://podofo.sourceforge.net/"
     TYPE OPTIONAL)
 
 # Find freetype
 find_package(Freetype)
 set_package_properties(Freetype PROPERTIES
     DESCRIPTION "A library to access font metadata"
     URL "http://www.freetype.org"
     TYPE OPTIONAL)
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
-
-# Update configuration
-include(MacroBoolTo01)
-macro_bool_to_01(TAGLIB_FOUND HAVE_TAGLIB)
-macro_bool_to_01(EXIV2_FOUND HAVE_EXIV2)
-macro_bool_to_01(PoDoFo_FOUND HAVE_PODOFO)
-macro_bool_to_01(KF5Archive_FOUND HAVE_KARCHIVE)
-macro_bool_to_01(FREETYPE_FOUND HAVE_FREETYPE)
+set(HAVE_TAGLIB TAGLIB_FOUND)
+set(HAVE_EXIV2 EXIV2_FOUND)
+set(HAVE_PODOFO PoDoFo_FOUND)
+set(HAVE_KARCHIVE KF5Archive_FOUND)
+set(HAVE_FREETYPE FREETYPE_FOUND)
 configure_file(config-krename.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krename.h)
 
 # Directories
 
 add_subdirectory(src)
 add_subdirectory(autotests)
diff --git a/cmake/modules/MacroBoolTo01.cmake b/cmake/modules/MacroBoolTo01.cmake
deleted file mode 100644
index 63b9852..0000000
--- a/cmake/modules/MacroBoolTo01.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-# MACRO_BOOL_TO_01( VAR RESULT0 ... RESULTN )
-# This macro evaluates its first argument
-# and sets all the given vaiables either to 0 or 1
-# depending on the value of the first one
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-MACRO(MACRO_BOOL_TO_01 FOUND_VAR )
-   FOREACH (_current_VAR ${ARGN})
-      IF(${FOUND_VAR})
-         SET(${_current_VAR} 1)
-      ELSE(${FOUND_VAR})
-         SET(${_current_VAR} 0)
-      ENDIF(${FOUND_VAR})
-   ENDFOREACH(_current_VAR)
-ENDMACRO(MACRO_BOOL_TO_01)
diff --git a/config-krename.h.cmake b/config-krename.h.cmake
index 959e5cb..862e40b 100644
--- a/config-krename.h.cmake
+++ b/config-krename.h.cmake
@@ -1,18 +1,18 @@
 /* config.h. Generated by cmake from config.h.cmake */
 
 /* have TagLib */
-#define HAVE_TAGLIB ${HAVE_TAGLIB}
+#cmakedefine01 HAVE_TAGLIB
 
 /* have Exiv2 */
-#define HAVE_EXIV2 ${HAVE_EXIV2}
+#cmakedefine01 HAVE_EXIV2
 
 /* have PoDoFo */
-#define HAVE_PODOFO ${HAVE_PODOFO}
+#cmakedefine01 HAVE_PODOFO
 
 /* have KArchive */
-#define HAVE_KARCHIVE ${HAVE_KARCHIVE}
+#cmakedefine01 HAVE_KARCHIVE
 
 /* have Freetype */
-#define HAVE_FREETYPE ${HAVE_FREETYPE}
+#cmakedefine01 HAVE_FREETYPE
 
 #define VERSION "${krename_VERSION}"