diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed2b99b96..c1fce2310 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,57 +90,57 @@ install( CODE "
 
 ##### user requested OPTIONs ####################
 
-OPTION( WITH_ALL_OPTIONS "Enable all OPTIONal support" OFF )
-
-OPTION( TDE_MALLOC "Use own malloc implementation" OFF )
-OPTION( TDE_MALLOC_DEBUG "Enable debugging in fast malloc" OFF )
-OPTION( TDE_MALLOC_FULL "Make alloc as fast as possible" OFF )
-
-OPTION( WITH_ARTS "Build with aRts" ON )
-OPTION( WITH_ALSA "Enable ALSA support" ON )
-OPTION( WITH_LIBART "Enable libart support (for SVG icons)" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_LIBIDN "Enable support for libidn" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_SSL "Enable support for SSL" ON )
-OPTION( WITH_CUPS "Enable CUPS support" ON )
-OPTION( WITH_IMAGETOPS_BINARY "Enable installation of imagetops binary" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_LUA "Enable LUA support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_TIFF "Enable tiff support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_JASPER "Enable jasper (jpeg2k) support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_OPENEXR "Enable openexr support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_UTEMPTER "Use utempter for utmp management" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_AVAHI "Enable AVAHI support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_ELFICON "Enable ELF embedded icon support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON )
-OPTION( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_INOTIFY "Enable inotify support for tdeio" ON )
-OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_TDEHWLIB "Enable TDE hwlib globally" ON )
-OPTION( WITH_TDEHWLIB_DAEMONS "Enable daemons for TDE hwlib" ${WITH_TDEHWLIB} )
-OPTION( WITH_DEVKITPOWER "Enable DeviceKit Power support" OFF )
-OPTION( WITH_LOGINDPOWER "Enable Logind/Systemd Power support" OFF )
-OPTION( WITH_UPOWER "Enable uPower support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_UDISKS "Enable uDisks support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_UDISKS2 "Enable uDisks2 support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_UDEVIL "Enable udevil support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_CONSOLEKIT "Enable ConsoleKit support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_NETWORK_MANAGER_BACKEND "Enable network-manager support" OFF )
-OPTION( WITH_SUDO_TDESU_BACKEND "Use sudo as backend for tdesu (default is su)" OFF )
-OPTION( WITH_OLD_XDG_STD "Use the pre R14.0.0 XDG standard where both TDE and KDE are recognized in desktop files" OFF )
-OPTION( WITH_PCSC "Enable PC/SC SmartCard support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_PKCS "Enable PKCS support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_CRYPTSETUP "Enable cryptsetup support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_LIBBFD "Enable pretty backtraces with libbfd from GNU binutils" OFF )
-OPTION( WITH_XRANDR "Build the tderandr library" ON )
-OPTION( WITH_XCOMPOSITE "Enable xcomposite support" ON )
-OPTION( WITH_MITSHM "Use MIT-SHM for pixmap loading/saving" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_KDE4_MENU_SUFFIX "Add [KDE4] tag to KDE4 menu items" OFF )
-
-OPTION( WITH_ISPELL "Enable ispell support" ON )
-OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} )
-
-OPTION( WITH_TDEICONLOADER_DEBUG "Enable debugging in TDEIconLoader class" OFF )
+option( WITH_ALL_OPTIONS "Enable all OPTIONal support" OFF )
+
+option( TDE_MALLOC "Use own malloc implementation" OFF )
+option( TDE_MALLOC_DEBUG "Enable debugging in fast malloc" OFF )
+option( TDE_MALLOC_FULL "Make alloc as fast as possible" OFF )
+
+option( WITH_ARTS "Build with aRts" ON )
+option( WITH_ALSA "Enable ALSA support" ON )
+option( WITH_LIBART "Enable libart support (for SVG icons)" ${WITH_ALL_OPTIONS} )
+option( WITH_LIBIDN "Enable support for libidn" ${WITH_ALL_OPTIONS} )
+option( WITH_SSL "Enable support for SSL" ON )
+option( WITH_CUPS "Enable CUPS support" ON )
+option( WITH_IMAGETOPS_BINARY "Enable installation of imagetops binary" ${WITH_ALL_OPTIONS} )
+option( WITH_LUA "Enable LUA support" ${WITH_ALL_OPTIONS} )
+option( WITH_TIFF "Enable tiff support" ${WITH_ALL_OPTIONS} )
+option( WITH_JASPER "Enable jasper (jpeg2k) support" ${WITH_ALL_OPTIONS} )
+option( WITH_OPENEXR "Enable openexr support" ${WITH_ALL_OPTIONS} )
+option( WITH_UTEMPTER "Use utempter for utmp management" ${WITH_ALL_OPTIONS} )
+option( WITH_AVAHI "Enable AVAHI support" ${WITH_ALL_OPTIONS} )
+option( WITH_ELFICON "Enable ELF embedded icon support" ${WITH_ALL_OPTIONS} )
+option( WITH_PCRE "Enable pcre regex support for kjs" ON )
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+option( WITH_INOTIFY "Enable inotify support for tdeio" ON )
+option( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} )
+option( WITH_TDEHWLIB "Enable TDE hwlib globally" ON )
+option( WITH_TDEHWLIB_DAEMONS "Enable daemons for TDE hwlib" ${WITH_TDEHWLIB} )
+option( WITH_DEVKITPOWER "Enable DeviceKit Power support" OFF )
+option( WITH_LOGINDPOWER "Enable Logind/Systemd Power support" OFF )
+option( WITH_UPOWER "Enable uPower support" ${WITH_ALL_OPTIONS} )
+option( WITH_UDISKS "Enable uDisks support" ${WITH_ALL_OPTIONS} )
+option( WITH_UDISKS2 "Enable uDisks2 support" ${WITH_ALL_OPTIONS} )
+option( WITH_UDEVIL "Enable udevil support" ${WITH_ALL_OPTIONS} )
+option( WITH_CONSOLEKIT "Enable ConsoleKit support" ${WITH_ALL_OPTIONS} )
+option( WITH_NETWORK_MANAGER_BACKEND "Enable network-manager support" OFF )
+option( WITH_SUDO_TDESU_BACKEND "Use sudo as backend for tdesu (default is su)" OFF )
+option( WITH_OLD_XDG_STD "Use the pre R14.0.0 XDG standard where both TDE and KDE are recognized in desktop files" OFF )
+option( WITH_PCSC "Enable PC/SC SmartCard support" ${WITH_ALL_OPTIONS} )
+option( WITH_PKCS "Enable PKCS support" ${WITH_ALL_OPTIONS} )
+option( WITH_CRYPTSETUP "Enable cryptsetup support" ${WITH_ALL_OPTIONS} )
+option( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} )
+option( WITH_LIBBFD "Enable pretty backtraces with libbfd from GNU binutils" OFF )
+option( WITH_XRANDR "Build the tderandr library" ON )
+option( WITH_XCOMPOSITE "Enable xcomposite support" ON )
+option( WITH_MITSHM "Use MIT-SHM for pixmap loading/saving" ${WITH_ALL_OPTIONS} )
+option( WITH_KDE4_MENU_SUFFIX "Add [KDE4] tag to KDE4 menu items" OFF )
+
+option( WITH_ISPELL "Enable ispell support" ON )
+option( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} )
+option( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} )
+
+option( WITH_TDEICONLOADER_DEBUG "Enable debugging in TDEIconLoader class" OFF )
 
 
 ##### set PKG_CONFIG_PATH #######################
diff --git a/kimgio/CMakeLists.txt b/kimgio/CMakeLists.txt
index e4a3a5297..be10cf809 100644
--- a/kimgio/CMakeLists.txt
+++ b/kimgio/CMakeLists.txt
@@ -142,7 +142,7 @@ if( OPENEXR_FOUND )
     DESTINATION ${PLUGIN_INSTALL_DIR}
   )
   # FIXME COMPILE_FLAGS must be written a little better
-  STRING(REGEX REPLACE ";" " -I" OPENEXR_INCLUDE_FLAGS "-I${OPENEXR_INCLUDE_DIRS}")
+  string(REGEX REPLACE ";" " -I" OPENEXR_INCLUDE_FLAGS "-I${OPENEXR_INCLUDE_DIRS}")
   set_target_properties( ${target}-module PROPERTIES COMPILE_FLAGS "${OPENEXR_INCLUDE_FLAGS}" )
   install( FILES exr.kimgio DESTINATION ${SERVICES_INSTALL_DIR} )
 endif( OPENEXR_FOUND )