From: André Pönitz <poenitz@gmx.net>
Date: Tue, 28 Aug 2007 18:30:02 +0000 (+0000)
Subject: cmake cosmetics
X-Git-Tag: 1.6.10~8649
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=6040a5faf6e6ca8fb88315984a6f3c09c8fcef80;p=lyx.git

cmake cosmetics

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19869 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/cmake/boost/libs/filesystem/CMakeLists.txt b/development/cmake/boost/libs/filesystem/CMakeLists.txt
index c92b59c4ee..8a559f3f39 100644
--- a/development/cmake/boost/libs/filesystem/CMakeLists.txt
+++ b/development/cmake/boost/libs/filesystem/CMakeLists.txt
@@ -10,16 +10,15 @@ set(boost_filesystem_sources
 	exception.cpp
 	operations.cpp
 	path.cpp
-	portability.cpp
-)
+	portability.cpp)
 
 lyx_add_path(boost_filesystem_sources ${TOP_SRC_DIR}/boost/libs/filesystem/src)
 
 if(NOT MERGE_FILES)
 	add_library(boost_filesystem STATIC ${boost_filesystem_sources})
-else(NOT MERGE_FILES)
+else()
 	add_definitions(-D_WIN32_WINNT=0x500)
 	lyx_const_touched_files(_allinone  boost_filesystem_sources)
 	add_library(boost_filesystem STATIC ${_allinone_files})
-endif(NOT MERGE_FILES)
+endif()
 
diff --git a/development/cmake/boost/libs/iostreams/CMakeLists.txt b/development/cmake/boost/libs/iostreams/CMakeLists.txt
index 46c5b9e7c2..35bf6341ff 100644
--- a/development/cmake/boost/libs/iostreams/CMakeLists.txt
+++ b/development/cmake/boost/libs/iostreams/CMakeLists.txt
@@ -9,8 +9,7 @@ project(boost_iostreams)
 set(boost_iostreams_sources
 	file_descriptor.cpp
 	mapped_file.cpp
-	zlib.cpp
-)
+	zlib.cpp)
 
 lyx_add_path(boost_iostreams_sources ${TOP_SRC_DIR}/boost/libs/iostreams/src)
 
@@ -18,11 +17,10 @@ include_directories(${ZLIB_INCLUDE_DIR})
 
 if(NOT MERGE_FILES)
 	add_library(boost_iostreams STATIC ${boost_iostreams_sources})
-else(NOT MERGE_FILES)
+else()
 	lyx_const_touched_files(_allinone  boost_iostreams_sources)
 	add_library(boost_iostreams STATIC ${_allinone_files})
-	
-endif(NOT MERGE_FILES)
+endif()
 
 target_link_libraries(boost_iostreams ${ZLIB_LIBRARY})
 
diff --git a/development/cmake/boost/libs/regex/CMakeLists.txt b/development/cmake/boost/libs/regex/CMakeLists.txt
index b7da4199d0..0f65b40f81 100644
--- a/development/cmake/boost/libs/regex/CMakeLists.txt
+++ b/development/cmake/boost/libs/regex/CMakeLists.txt
@@ -15,8 +15,7 @@ set(boost_regex_sources
 	regex.cpp
 	regex_raw_buffer.cpp
 	regex_traits_defaults.cpp
-	w32_regex_traits.cpp
-)
+	w32_regex_traits.cpp)
 
 lyx_add_path(boost_regex_sources ${TOP_SRC_DIR}/boost/libs/regex/src)
 
diff --git a/development/cmake/boost/libs/signals/CMakeLists.txt b/development/cmake/boost/libs/signals/CMakeLists.txt
index c794d61ebd..af409ea55c 100644
--- a/development/cmake/boost/libs/signals/CMakeLists.txt
+++ b/development/cmake/boost/libs/signals/CMakeLists.txt
@@ -18,8 +18,8 @@ lyx_add_path(boost_signals_sources ${TOP_SRC_DIR}/boost/libs/signals/src)
 
 if(NOT MERGE_FILES)
 	add_library(boost_signals STATIC ${boost_signals_sources})
-else(NOT MERGE_FILES)
+else()
 	lyx_const_touched_files(_allinone  boost_signals_sources)
 	add_library(boost_signals STATIC ${_allinone_files})
-endif(NOT MERGE_FILES)
+endif()
 
diff --git a/development/cmake/intl/CMakeLists.txt b/development/cmake/intl/CMakeLists.txt
index 25d7ba016d..e5eb7cdefd 100644
--- a/development/cmake/intl/CMakeLists.txt
+++ b/development/cmake/intl/CMakeLists.txt
@@ -20,24 +20,21 @@ add_definitions(
     -DNO_XMALLOC
     -Dset_relocation_prefix=libintl_set_relocation_prefix
     -Drelocate=libintl_relocate
-    -DDEPENDS_ON_LIBICONV=1
-    )
+    -DDEPENDS_ON_LIBICONV=1)
     
-if (NOT APPLE)    
-add_definitions(
-		-DLOCALEDIR=\\"${LOACLE_DIR}\\" 
-		-DLOCALE_ALIAS_PATH=\\"${LOACLE_DIR}\\"
-		-DLIBDIR=\\"${TOP_SRC_DIR}\\"
-		-DINSTALLDIR=\\"${PREFIX}\\" 
-		)
-else (NOT APPLE) 
-add_definitions(
-		-DLOCALEDIR='\"${LOCALE_DIR}\"' 
-		-DLOCALE_ALIAS_PATH='\"${LOCALE_DIR}\"'
-		-DLIBDIR='\"${TOP_SRC_DIR}\"'
-		-DINSTALLDIR='\"${PREFIX}\"' 
-		)
-endif (NOT APPLE)
+if(NOT APPLE)    
+	add_definitions(
+			-DLOCALEDIR=\\"${LOACLE_DIR}\\" 
+			-DLOCALE_ALIAS_PATH=\\"${LOACLE_DIR}\\"
+			-DLIBDIR=\\"${TOP_SRC_DIR}\\"
+			-DINSTALLDIR=\\"${PREFIX}\\" )
+else()
+	add_definitions(
+			-DLOCALEDIR='\"${LOCALE_DIR}\"' 
+			-DLOCALE_ALIAS_PATH='\"${LOCALE_DIR}\"'
+			-DLIBDIR='\"${TOP_SRC_DIR}\"'
+			-DINSTALLDIR='\"${PREFIX}\"' )
+endif()
 
 file(GLOB intl_headers ${TOP_SRC_DIR}/intl/*.h)
 
@@ -73,13 +70,13 @@ include_directories(${TOP_SRC_DIR}/intl ${CMAKE_CURRENT_BINARY_DIR})
 
 if(ICONV_FOUND)
 	include_directories(${ICONV_INCLUDE_DIR})
-endif(ICONV_FOUND)
+endif()
 
 add_library(intl STATIC ${intl_sources} ${intl_headers})
 
 if(ICONV_FOUND)
 	target_link_libraries(intl ${ICONV_LIBRARY})
-endif(ICONV_FOUND)
+endif()
 
 project_source_group("${GROUP_CODE}" intl_sources intl_headers)
 
diff --git a/development/cmake/modules/FindASPELL.cmake b/development/cmake/modules/FindASPELL.cmake
index dfc5e64897..ca9f4da365 100644
--- a/development/cmake/modules/FindASPELL.cmake
+++ b/development/cmake/modules/FindASPELL.cmake
@@ -35,13 +35,13 @@
 
 if(WIN32)
 	file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR)
-endif(WIN32)
+endif()
 
 
-if (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARY)
+if(ASPELL_INCLUDE_DIR AND ASPELL_LIBRARY)
 	# Already in cache, be silent
 	set(ASPELL_FIND_QUIETLY TRUE)
-endif (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARY)
+endif()
 
 FIND_PATH(ASPELL_INCLUDE_DIR aspell.h
 	/usr/include
@@ -64,31 +64,31 @@ if(MSVC)
 		 		
 	if(MSVC_IDE)
 		if(NOT ASPELL_LIBRARY_DEBUG OR NOT ASPELL_LIBRARY_RELEASE)
-			SET(ASPELL_LIBRARY)
-		else(NOT ASPELL_LIBRARY_DEBUG OR NOT ASPELL_LIBRARY_RELEASE)	
-			SET(ASPELL_LIBRARY optimized ${ASPELL_LIBRARY_RELEASE} debug ${ASPELL_LIBRARY_DEBUG})
-		endif(NOT ASPELL_LIBRARY_DEBUG OR NOT ASPELL_LIBRARY_RELEASE)	
-	else(MSVC_IDE)
+			set(ASPELL_LIBRARY)
+		else()	
+			set(ASPELL_LIBRARY optimized ${ASPELL_LIBRARY_RELEASE} debug ${ASPELL_LIBRARY_DEBUG})
+		endif()	
+	else()
 		string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
 		if(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
 			set(ASPELL_LIBRARY ${ASPELL_LIBRARY_DEBUG})
-		else(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+		else()
 			set(ASPELL_LIBRARY ${ASPELL_LIBRARY_RELEASE})
-		endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
-	endif(MSVC_IDE)
-else(MSVC)
+		endif()
+	endif()
+else()
 	set(ASPELL_LIBRARY ${ASPELL_LIBRARY_RELEASE})
-endif(MSVC)
+endif()
 
-if (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARY)
+if(ASPELL_INCLUDE_DIR AND ASPELL_LIBRARY)
 	 set(ASPELL_FOUND TRUE)
-endif (ASPELL_INCLUDE_DIR AND ASPELL_LIBRARY)
+endif()
 
-if (ASPELL_FOUND)
+if(ASPELL_FOUND)
 	if (NOT ASPELL_FIND_QUIETLY)
 	message(STATUS "Found ASPELL: ${ASPELL_LIBRARY}")
-	endif (NOT ASPELL_FIND_QUIETLY)
-else (ASPELL_FOUND)
+	endif()
+else()
 	if (ASPELL_FIND_REQUIRED)
 	message("aspell header      : ${ASPELL_INCLUDE_DIR}")
 	message("aspell lib release : ${ASPELL_LIBRARY_RELEASE}")
@@ -97,10 +97,10 @@ else (ASPELL_FOUND)
 		# the ide needs	the debug and release version
 		if(NOT ASPELL_LIBRARY_DEBUG OR NOT ASPELL_LIBRARY_RELEASE)
 			 message(FATAL_ERROR "\nCould NOT find the debug AND release version of the aspell library.\nYou need to have both to use MSVC projects.\nPlease build and install both kdelibs/win/ libraries first.\n")
-		endif(NOT ASPELL_LIBRARY_DEBUG OR NOT ASPELL_LIBRARY_RELEASE)
-	endif(MSVC_IDE)
+		endif()
+	endif()
 	message(FATAL_ERROR "Could NOT find ASPELL")
-	endif (ASPELL_FIND_REQUIRED)
-endif (ASPELL_FOUND)
+	endif()
+endif()
 
 MARK_AS_ADVANCED(ASPELL_INCLUDE_DIR ASPELL_LIBRARY)
diff --git a/development/cmake/modules/FindGNUWIN32.cmake b/development/cmake/modules/FindGNUWIN32.cmake
index a7c04a4038..43397890ce 100644
--- a/development/cmake/modules/FindGNUWIN32.cmake
+++ b/development/cmake/modules/FindGNUWIN32.cmake
@@ -2,47 +2,47 @@
 #  from kdelibs
 #
 
-if (WIN32)
+if(WIN32)
 
-# check if GNUWIN32_DIR is already set 
-# (e.g. by command line argument or the calling script)
-if(NOT GNUWIN32_DIR)
-	# check for enviroment variable
-	file(TO_CMAKE_PATH "$ENV{GNUWIN32_DIR}" GNUWIN32_DIR)
+	# check if GNUWIN32_DIR is already set 
+	# (e.g. by command line argument or the calling script)
 	if(NOT GNUWIN32_DIR)
-		# search in the default program install folder
-		file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _progFiles)
-		find_file(GNUWIN32_DIR_tmp gnuwin32 win32libs 
-   			PATHS
-   			"${_progFiles}"
-   			"C:/" "D:/" "E:/" "F:/" "G:/"
-		)
-		set(GNUWIN32_DIR ${GNUWIN32_DIR_tmp})
-	endif(NOT GNUWIN32_DIR)
-else(NOT GNUWIN32_DIR)
-	SET(GNUWIN32_DIR ${GNUWIN32_DIR} CACHE TYPE STRING)
-endif(NOT GNUWIN32_DIR)
+		# check for enviroment variable
+		file(TO_CMAKE_PATH "$ENV{GNUWIN32_DIR}" GNUWIN32_DIR)
+		if(NOT GNUWIN32_DIR)
+			# search in the default program install folder
+			file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _progFiles)
+			find_file(GNUWIN32_DIR_tmp gnuwin32 win32libs 
+					PATHS
+					"${_progFiles}"
+					"C:/" "D:/" "E:/" "F:/" "G:/"
+			)
+			set(GNUWIN32_DIR ${GNUWIN32_DIR_tmp})
+		endif()
+	else()
+		set(GNUWIN32_DIR ${GNUWIN32_DIR} CACHE TYPE STRING)
+	endif()
 
-if (GNUWIN32_DIR)
-   set(GNUWIN32_INCLUDE_DIR ${GNUWIN32_DIR}/include)
-   set(GNUWIN32_LIBRARY_DIR ${GNUWIN32_DIR}/lib)
-   set(GNUWIN32_BINARY_DIR  ${GNUWIN32_DIR}/bin)
-   set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${GNUWIN32_INCLUDE_DIR})
-   set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${GNUWIN32_LIBRARY_DIR})
-   set(GNUWIN32_FOUND TRUE)
-else (GNUWIN32_DIR)
-   set(GNUWIN32_FOUND)
-endif (GNUWIN32_DIR)
+	if(GNUWIN32_DIR)
+		 set(GNUWIN32_INCLUDE_DIR ${GNUWIN32_DIR}/include)
+		 set(GNUWIN32_LIBRARY_DIR ${GNUWIN32_DIR}/lib)
+		 set(GNUWIN32_BINARY_DIR  ${GNUWIN32_DIR}/bin)
+		 set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${GNUWIN32_INCLUDE_DIR})
+		 set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${GNUWIN32_LIBRARY_DIR})
+		 set(GNUWIN32_FOUND TRUE)
+	else()
+		 set(GNUWIN32_FOUND)
+	endif()
 
-if (GNUWIN32_FOUND)
-  if (NOT GNUWIN32_FIND_QUIETLY)
-    message(STATUS "Found GNUWIN32: ${GNUWIN32_DIR}")
-  endif (NOT GNUWIN32_FIND_QUIETLY)
-else (GNUWIN32_FOUND)
-  if (GNUWIN32_FIND_REQUIRED)
-    message(SEND_ERROR "Could NOT find GNUWIN32")
-  endif (GNUWIN32_FIND_REQUIRED)
-endif (GNUWIN32_FOUND)
+	if(GNUWIN32_FOUND)
+		if (NOT GNUWIN32_FIND_QUIETLY)
+			message(STATUS "Found GNUWIN32: ${GNUWIN32_DIR}")
+		endif()
+	else()
+		if (GNUWIN32_FIND_REQUIRED)
+			message(SEND_ERROR "Could NOT find GNUWIN32")
+		endif()
+	endif()
 
-endif (WIN32)
+endif()
 
diff --git a/development/cmake/modules/FindICONV.cmake b/development/cmake/modules/FindICONV.cmake
index bd3a49ad68..cb6e106fcf 100644
--- a/development/cmake/modules/FindICONV.cmake
+++ b/development/cmake/modules/FindICONV.cmake
@@ -28,7 +28,7 @@
 if (ICONV_INCLUDE_DIR)
   # Already in cache, be silent
   set(ICONV_FIND_QUIETLY TRUE)
-endif (ICONV_INCLUDE_DIR)
+endif()
 
 FIND_PATH(ICONV_INCLUDE_DIR iconv.h
  /usr/include
@@ -36,6 +36,7 @@ FIND_PATH(ICONV_INCLUDE_DIR iconv.h
 )
 
 set(POTENTIAL_ICONV_LIBS iconv libiconv libiconv2)
+
 FIND_LIBRARY(ICONV_LIBRARY NAMES ${POTENTIAL_ICONV_LIBS}
 PATHS
  /usr/lib
@@ -52,49 +53,49 @@ if(WIN32)
 					NAMES ${ICONV_DLL_NAMES}
 					PATHS ENV PATH
 					${ICONV_INCLUDE_DIR}/../bin)
-	IF(ICONV_FIND_REQUIRED)
-		IF(NOT ICONV_DLL AND NOT ICONV_DLL_HELP)
-			MESSAGE(FATAL_ERROR "Could not find iconv.dll, please add correct your PATH environment variable")
-		ENDIF(NOT ICONV_DLL AND NOT ICONV_DLL_HELP)
-		IF(NOT ICONV_DLL AND ICONV_DLL_HELP)
+	if(ICONV_FIND_REQUIRED)
+		if(NOT ICONV_DLL AND NOT ICONV_DLL_HELP)
+			message(FATAL_ERROR "Could not find iconv.dll, please add correct your PATH environment variable")
+		endif()
+		if(NOT ICONV_DLL AND ICONV_DLL_HELP)
 			GET_FILENAME_COMPONENT(ICONV_DLL_HELP ${ICONV_DLL_HELP} PATH)
-			MESSAGE(STATUS)
-			MESSAGE(STATUS "Could not find iconv.dll in standard search path, please add ")
-			MESSAGE(STATUS "${ICONV_DLL_HELP}")
-			MESSAGE(STATUS "to your PATH environment variable.")
-			MESSAGE(STATUS)
-			MESSAGE(FATAL_ERROR "exit cmake")
-		ENDIF(NOT ICONV_DLL AND ICONV_DLL_HELP)
-	ENDIF(ICONV_FIND_REQUIRED)
-	IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY AND ICONV_DLL)
-   		SET(ICONV_FOUND TRUE)
-	ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY AND ICONV_DLL)
-ELSE(WIN32)
+			message(STATUS)
+			message(STATUS "Could not find iconv.dll in standard search path, please add ")
+			message(STATUS "${ICONV_DLL_HELP}")
+			message(STATUS "to your PATH environment variable.")
+			message(STATUS)
+			message(FATAL_ERROR "exit cmake")
+		endif()
+	endif()
+	if(ICONV_INCLUDE_DIR AND ICONV_LIBRARY AND ICONV_DLL)
+   		set(ICONV_FOUND TRUE)
+	endif()
+else()
 	check_function_exists(iconv HAVE_ICONV_IN_LIBC)
-	IF (ICONV_INCLUDE_DIR AND HAVE_ICONV_IN_LIBC)
-   		SET(ICONV_FOUND TRUE)
-		SET(ICONV_LIBRARY  CACHE TYPE STRING FORCE)
-	ENDIF (ICONV_INCLUDE_DIR AND HAVE_ICONV_IN_LIBC)
-	IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY)
-   		SET(ICONV_FOUND TRUE)
-	ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY)
-endif(WIN32)
+	if(ICONV_INCLUDE_DIR AND HAVE_ICONV_IN_LIBC)
+   		set(ICONV_FOUND TRUE)
+		set(ICONV_LIBRARY  CACHE TYPE STRING FORCE)
+	endif()
+	if(ICONV_INCLUDE_DIR AND ICONV_LIBRARY)
+   		set(ICONV_FOUND TRUE)
+	endif()
+endif()
 
 
 
-IF (ICONV_FOUND)
-   IF (NOT ICONV_FIND_QUIETLY)
-      MESSAGE(STATUS "Found iconv library: ${ICONV_LIBRARY}")
-      #MESSAGE(STATUS "Found iconv   dll  : ${ICONV_DLL}")
-   ENDIF (NOT ICONV_FIND_QUIETLY)
-ELSE (ICONV_FOUND)
-   IF (ICONV_FIND_REQUIRED)
-      MESSAGE(STATUS "Looked for iconv library named ${POTENTIAL_ICONV_LIBS}.")
-      MESSAGE(STATUS "Found no acceptable iconv library. This is fatal.")
-      MESSAGE(STATUS "iconv header: ${ICONV_INCLUDE_DIR}")
-      MESSAGE(STATUS "iconv lib   : ${ICONV_LIBRARY}")
-      MESSAGE(FATAL_ERROR "Could NOT find iconv library")
-   ENDIF (ICONV_FIND_REQUIRED)
-ENDIF (ICONV_FOUND)
+if(ICONV_FOUND)
+   if(NOT ICONV_FIND_QUIETLY)
+      message(STATUS "Found iconv library: ${ICONV_LIBRARY}")
+      #message(STATUS "Found iconv   dll  : ${ICONV_DLL}")
+   endif()
+else()
+   if(ICONV_FIND_REQUIRED)
+      message(STATUS "Looked for iconv library named ${POTENTIAL_ICONV_LIBS}.")
+      message(STATUS "Found no acceptable iconv library. This is fatal.")
+      message(STATUS "iconv header: ${ICONV_INCLUDE_DIR}")
+      message(STATUS "iconv lib   : ${ICONV_LIBRARY}")
+      message(FATAL_ERROR "Could NOT find iconv library")
+   endif()
+endif()
 
 MARK_AS_ADVANCED(ICONV_LIBRARY ICONV_INCLUDE_DIR)
diff --git a/development/cmake/modules/FindQt4.cmake b/development/cmake/modules/FindQt4.cmake
index 41789dd758..824d263954 100644
--- a/development/cmake/modules/FindQt4.cmake
+++ b/development/cmake/modules/FindQt4.cmake
@@ -169,9 +169,9 @@
 INCLUDE(CheckSymbolExists)
 INCLUDE(MacroAddFileDependencies)
 
-SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
+set(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
 
-SET( QT_DEFINITIONS "")
+set( QT_DEFINITIONS "")
 
 # check for qmake
 FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake-qt4 PATHS
@@ -180,7 +180,7 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake-qt4 PATHS
   $ENV{QTDIR}/bin
   )
 
-SET(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
+set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
 
 ##  macro for asking qmake to process pro files
 MACRO(QT_QUERY_QMAKE outvar invar)
@@ -199,12 +199,12 @@ ENDMACRO(QT_QUERY_QMAKE)
 
 IF (QT_QMAKE_EXECUTABLE)
 
-  SET(QT4_QMAKE_FOUND FALSE)
+  set(QT4_QMAKE_FOUND FALSE)
   
   EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
   # check for qt3 qmake and then try and find qmake-qt4 in the path
   IF("${QTVERSION}" MATCHES "Unknown")
-    SET(QT_QMAKE_EXECUTABLE NOTFOUND CACHE FILEPATH "" FORCE)
+    set(QT_QMAKE_EXECUTABLE NOTFOUND CACHE FILEPATH "" FORCE)
     FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 PATHS
       "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
       "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
@@ -213,22 +213,22 @@ IF (QT_QMAKE_EXECUTABLE)
     IF(QT_QMAKE_EXECUTABLE)
       EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} 
         ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION)
-    ENDIF(QT_QMAKE_EXECUTABLE)
-  ENDIF("${QTVERSION}" MATCHES "Unknown")
+    endif()
+  endif()
   # check that we found the Qt4 qmake, Qt3 qmake output won't match here
   STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" qt_version_tmp "${QTVERSION}")
   IF (qt_version_tmp)
 
     # we need at least version 4.0.0
     IF (NOT QT_MIN_VERSION)
-      SET(QT_MIN_VERSION "4.0.0")
-    ENDIF (NOT QT_MIN_VERSION)
+      set(QT_MIN_VERSION "4.0.0")
+    endif()
     
     #now parse the parts of the user given version string into variables
     STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" req_qt_major_vers "${QT_MIN_VERSION}")
     IF (NOT req_qt_major_vers)
-      MESSAGE( FATAL_ERROR "Invalid Qt version string given: \"${QT_MIN_VERSION}\", expected e.g. \"4.0.1\"")
-    ENDIF (NOT req_qt_major_vers)
+      message( FATAL_ERROR "Invalid Qt version string given: \"${QT_MIN_VERSION}\", expected e.g. \"4.0.1\"")
+    endif()
     
     # now parse the parts of the user given version string into variables
     STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" req_qt_major_vers "${QT_MIN_VERSION}")
@@ -236,8 +236,8 @@ IF (QT_QMAKE_EXECUTABLE)
     STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT_MIN_VERSION}")
     
     IF (NOT req_qt_major_vers EQUAL 4)
-      MESSAGE( FATAL_ERROR "Invalid Qt version string given: \"${QT_MIN_VERSION}\", major version 4 is required, e.g. \"4.0.1\"")
-    ENDIF (NOT req_qt_major_vers EQUAL 4)
+      message( FATAL_ERROR "Invalid Qt version string given: \"${QT_MIN_VERSION}\", major version 4 is required, e.g. \"4.0.1\"")
+    endif()
     
     # and now the version string given by qmake
     STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" found_qt_major_vers "${QTVERSION}")
@@ -249,14 +249,14 @@ IF (QT_QMAKE_EXECUTABLE)
     MATH(EXPR found_vers "${found_qt_major_vers}*10000 + ${found_qt_minor_vers}*100 + ${found_qt_patch_vers}")
     
     IF (found_vers LESS req_vers)
-      SET(QT4_QMAKE_FOUND FALSE)
-      SET(QT4_INSTALLED_VERSION_TOO_OLD TRUE)
-    ELSE (found_vers LESS req_vers)
-      SET(QT4_QMAKE_FOUND TRUE)
-    ENDIF (found_vers LESS req_vers)
-  ENDIF (qt_version_tmp)
+      set(QT4_QMAKE_FOUND FALSE)
+      set(QT4_INSTALLED_VERSION_TOO_OLD TRUE)
+    else()
+      set(QT4_QMAKE_FOUND TRUE)
+    endif()
+  endif()
 
-ENDIF (QT_QMAKE_EXECUTABLE)
+endif()
 
 IF (QT4_QMAKE_FOUND)
 
@@ -267,40 +267,40 @@ IF (QT4_QMAKE_FOUND)
       ARGS "-query QT_INSTALL_LIBS"
       OUTPUT_VARIABLE QT_LIBRARY_DIR_TMP )
     IF(EXISTS "${QT_LIBRARY_DIR_TMP}")
-      SET(QT_LIBRARY_DIR ${QT_LIBRARY_DIR_TMP} CACHE PATH "Qt library dir")
-    ELSE(EXISTS "${QT_LIBRARY_DIR_TMP}")
-      MESSAGE("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_LIBS as ${QT_LIBRARY_DIR_TMP}")
-      MESSAGE("Warning: ${QT_LIBRARY_DIR_TMP} does NOT exist, Qt must NOT be installed correctly.")
-    ENDIF(EXISTS "${QT_LIBRARY_DIR_TMP}")
-  ENDIF(NOT QT_LIBRARY_DIR)
+      set(QT_LIBRARY_DIR ${QT_LIBRARY_DIR_TMP} CACHE PATH "Qt library dir")
+    else()
+      message("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_LIBS as ${QT_LIBRARY_DIR_TMP}")
+      message("Warning: ${QT_LIBRARY_DIR_TMP} does NOT exist, Qt must NOT be installed correctly.")
+    endif()
+  endif()
   
   IF (APPLE)
     IF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
-      SET(QT_USE_FRAMEWORKS ON
+      set(QT_USE_FRAMEWORKS ON
         CACHE BOOL "Set to ON if Qt build uses frameworks.")
-    ELSE (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
-      SET(QT_USE_FRAMEWORKS OFF
+    else()
+      set(QT_USE_FRAMEWORKS OFF
         CACHE BOOL "Set to ON if Qt build uses frameworks.")
-    ENDIF (EXISTS ${QT_LIBRARY_DIR}/QtCore.framework)
+    endif()
     
     MARK_AS_ADVANCED(QT_USE_FRAMEWORKS)
-  ENDIF (APPLE)
+  endif()
   
   # ask qmake for the binary dir
   IF (NOT QT_BINARY_DIR)
     EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE}
       ARGS "-query QT_INSTALL_BINS"
       OUTPUT_VARIABLE qt_bins )
-    SET(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "")
-  ENDIF (NOT QT_BINARY_DIR)
+    set(QT_BINARY_DIR ${qt_bins} CACHE INTERNAL "")
+  endif()
 
   # ask qmake for the include dir
   IF (NOT QT_HEADERS_DIR)
     EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
       ARGS "-query QT_INSTALL_HEADERS" 
       OUTPUT_VARIABLE qt_headers )
-    SET(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "")
-  ENDIF(NOT QT_HEADERS_DIR)
+    set(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "")
+  endif()
 
 
   # ask qmake for the documentation directory
@@ -308,24 +308,24 @@ IF (QT4_QMAKE_FOUND)
     EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
       ARGS "-query QT_INSTALL_DOCS"
       OUTPUT_VARIABLE qt_doc_dir )
-    SET(QT_DOC_DIR ${qt_doc_dir} CACHE PATH "The location of the Qt docs")
-  ENDIF (NOT QT_DOC_DIR)
+    set(QT_DOC_DIR ${qt_doc_dir} CACHE PATH "The location of the Qt docs")
+  endif()
 
   # ask qmake for the mkspecs directory
   IF (NOT QT_MKSPECS_DIR)
     EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
       ARGS "-query QMAKE_MKSPECS"
       OUTPUT_VARIABLE qt_mkspecs_dir )
-    SET(QT_MKSPECS_DIR ${qt_mkspecs_dir} CACHE PATH "The location of the Qt mkspecs")
-  ENDIF (NOT QT_MKSPECS_DIR)
+    set(QT_MKSPECS_DIR ${qt_mkspecs_dir} CACHE PATH "The location of the Qt mkspecs")
+  endif()
 
   # ask qmake for the plugins directory
   IF (NOT QT_PLUGINS_DIR)
     EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
       ARGS "-query QT_INSTALL_PLUGINS"
       OUTPUT_VARIABLE qt_plugins_dir )
-    SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins")
-  ENDIF (NOT QT_PLUGINS_DIR)
+    set(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins")
+  endif()
   ########################################
   #
   #       Setting the INCLUDE-Variables
@@ -341,18 +341,18 @@ IF (QT4_QMAKE_FOUND)
   # Set QT_INCLUDE_DIR by removine "/QtCore" in the string ${QT_QTCORE_INCLUDE_DIR}
   IF( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
     IF (QT_USE_FRAMEWORKS)
-      SET(QT_INCLUDE_DIR ${QT_HEADERS_DIR})
-    ELSE (QT_USE_FRAMEWORKS)
+      set(QT_INCLUDE_DIR ${QT_HEADERS_DIR})
+    else()
       STRING( REGEX REPLACE "/QtCore$" "" qt4_include_dir ${QT_QTCORE_INCLUDE_DIR})
-      SET( QT_INCLUDE_DIR ${qt4_include_dir} CACHE PATH "")
-    ENDIF (QT_USE_FRAMEWORKS)
-  ENDIF( QT_QTCORE_INCLUDE_DIR AND NOT QT_INCLUDE_DIR)
+      set( QT_INCLUDE_DIR ${qt4_include_dir} CACHE PATH "")
+    endif()
+  endif()
 
   IF( NOT QT_INCLUDE_DIR)
     IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
-      MESSAGE( FATAL_ERROR "Could NOT find QtGlobal header")
-    ENDIF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
-  ENDIF( NOT QT_INCLUDE_DIR)
+      message( FATAL_ERROR "Could NOT find QtGlobal header")
+    endif()
+  endif()
 
   #############################################
   #
@@ -360,9 +360,9 @@ IF (QT4_QMAKE_FOUND)
   #
   #############################################
   # Save required includes variable
-  SET(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES})
+  set(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES})
   # Add QT_INCLUDE_DIR to CMAKE_REQUIRED_INCLUDES
-  SET(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${QT_INCLUDE_DIR}")
+  set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${QT_INCLUDE_DIR}")
   # Check for Window system symbols (note: only one should end up being set)
   CHECK_SYMBOL_EXISTS(Q_WS_X11 "QtCore/qglobal.h" Q_WS_X11)
   CHECK_SYMBOL_EXISTS(Q_WS_MAC "QtCore/qglobal.h" Q_WS_MAC)
@@ -371,18 +371,18 @@ IF (QT4_QMAKE_FOUND)
   IF (QT_QTCOPY_REQUIRED)
     CHECK_SYMBOL_EXISTS(QT_IS_QTCOPY "QtCore/qglobal.h" QT_KDE_QT_COPY)
     IF (NOT QT_IS_QTCOPY)
-      MESSAGE(FATAL_ERROR "qt-copy is required, but hasn't been found")
-    ENDIF (NOT QT_IS_QTCOPY)
-  ENDIF (QT_QTCOPY_REQUIRED)
+      message(FATAL_ERROR "qt-copy is required, but hasn't been found")
+    endif()
+  endif()
 
   # Restore CMAKE_REQUIRED_INCLUDES variable
-  SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE})
+  set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE})
   #
   #############################################
 
   IF (QT_USE_FRAMEWORKS)
-    SET(QT_DEFINITIONS ${QT_DEFINITIONS} -F${QT_LIBRARY_DIR} -L${QT_LIBRARY_DIR} )
-  ENDIF (QT_USE_FRAMEWORKS)
+    set(QT_DEFINITIONS ${QT_DEFINITIONS} -F${QT_LIBRARY_DIR} -L${QT_LIBRARY_DIR} )
+  endif()
 
   # Set QT_QT3SUPPORT_INCLUDE_DIR
   FIND_PATH(QT_QT3SUPPORT_INCLUDE_DIR Qt3Support
@@ -437,7 +437,7 @@ IF (QT4_QMAKE_FOUND)
   # Set QT_QTMOTIF_INCLUDE_DIR
   IF(Q_WS_X11)
     FIND_PATH(QT_QTMOTIF_INCLUDE_DIR QtMotif PATHS ${QT_INCLUDE_DIR}/QtMotif NO_DEFAULT_PATH )
-  ENDIF(Q_WS_X11)
+  endif()
 
   # Set QT_QTNETWORK_INCLUDE_DIR
   FIND_PATH(QT_QTNETWORK_INCLUDE_DIR QtNetwork
@@ -499,7 +499,7 @@ IF (QT4_QMAKE_FOUND)
   MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR QT_DOC_DIR)
 
   # Set QT_INCLUDES
-  SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default )
+  set( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default )
 
   # Set QT_QTCORE_LIBRARY by searching for a lib with "QtCore."  as part of the filename
   FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE NAMES QtCore QtCore4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH )
@@ -517,7 +517,7 @@ IF (QT4_QMAKE_FOUND)
   IF(Q_WS_X11)
     FIND_LIBRARY(QT_QTMOTIF_LIBRARY_RELEASE NAMES QtMotif PATHS ${QT_LIBRARY_DIR}       NO_DEFAULT_PATH)
     FIND_LIBRARY(QT_QTMOTIF_LIBRARY_DEBUG   NAMES QtMotif_debug PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
-  ENDIF(Q_WS_X11)
+  endif()
 
   # Set QT_QTNETWORK_LIBRARY
   FIND_LIBRARY(QT_QTNETWORK_LIBRARY_RELEASE NAMES QtNetwork QtNetwork4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
@@ -555,9 +555,9 @@ IF (QT4_QMAKE_FOUND)
 
   IF( NOT QT_QTCORE_LIBRARY_DEBUG AND NOT QT_QTCORE_LIBRARY_RELEASE )
     IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
-      MESSAGE( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.")
-    ENDIF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
-  ENDIF( NOT QT_QTCORE_LIBRARY_DEBUG AND NOT QT_QTCORE_LIBRARY_RELEASE )
+      message( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.")
+    endif()
+  endif()
 
   # Set QT_QTASSISTANT_LIBRARY
   FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient QtAssistantClient4 QtAssistant QtAssistant4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
@@ -571,7 +571,7 @@ IF (QT4_QMAKE_FOUND)
   IF(WIN32)
     FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain  PATHS ${QT_LIBRARY_DIR}  NO_DEFAULT_PATH)
     FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG   NAMES qtmaind PATHS ${QT_LIBRARY_DIR}  NO_DEFAULT_PATH)
-  ENDIF(WIN32)
+  endif()
 
   ############################################
   #
@@ -584,41 +584,41 @@ IF (QT4_QMAKE_FOUND)
 
       # if only the release version was found, set the debug variable also to the release version
       IF (QT_${basename}_LIBRARY_RELEASE AND NOT QT_${basename}_LIBRARY_DEBUG)
-        SET(QT_${basename}_LIBRARY_DEBUG ${QT_${basename}_LIBRARY_RELEASE})
-        SET(QT_${basename}_LIBRARY       ${QT_${basename}_LIBRARY_RELEASE})
-        SET(QT_${basename}_LIBRARIES     ${QT_${basename}_LIBRARY_RELEASE})
-      ENDIF (QT_${basename}_LIBRARY_RELEASE AND NOT QT_${basename}_LIBRARY_DEBUG)
+        set(QT_${basename}_LIBRARY_DEBUG ${QT_${basename}_LIBRARY_RELEASE})
+        set(QT_${basename}_LIBRARY       ${QT_${basename}_LIBRARY_RELEASE})
+        set(QT_${basename}_LIBRARIES     ${QT_${basename}_LIBRARY_RELEASE})
+      endif()
 
       # if only the debug version was found, set the release variable also to the debug version
       IF (QT_${basename}_LIBRARY_DEBUG AND NOT QT_${basename}_LIBRARY_RELEASE)
-        SET(QT_${basename}_LIBRARY_RELEASE ${QT_${basename}_LIBRARY_DEBUG})
-        SET(QT_${basename}_LIBRARY         ${QT_${basename}_LIBRARY_DEBUG})
-        SET(QT_${basename}_LIBRARIES       ${QT_${basename}_LIBRARY_DEBUG})
-      ENDIF (QT_${basename}_LIBRARY_DEBUG AND NOT QT_${basename}_LIBRARY_RELEASE)
+        set(QT_${basename}_LIBRARY_RELEASE ${QT_${basename}_LIBRARY_DEBUG})
+        set(QT_${basename}_LIBRARY         ${QT_${basename}_LIBRARY_DEBUG})
+        set(QT_${basename}_LIBRARIES       ${QT_${basename}_LIBRARY_DEBUG})
+      endif()
       IF (QT_${basename}_LIBRARY_DEBUG AND QT_${basename}_LIBRARY_RELEASE)
         # if the generator supports configuration types then set
         # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
         IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-          SET(QT_${basename}_LIBRARY       optimized ${QT_${basename}_LIBRARY_RELEASE} debug ${QT_${basename}_LIBRARY_DEBUG})
-        ELSE(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+          set(QT_${basename}_LIBRARY       optimized ${QT_${basename}_LIBRARY_RELEASE} debug ${QT_${basename}_LIBRARY_DEBUG})
+        else()
           # if there are no configuration types and CMAKE_BUILD_TYPE has no value
           # then just use the release libraries
-          SET(QT_${basename}_LIBRARY       ${QT_${basename}_LIBRARY_RELEASE} )
-        ENDIF(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-        SET(QT_${basename}_LIBRARIES       optimized ${QT_${basename}_LIBRARY_RELEASE} debug ${QT_${basename}_LIBRARY_DEBUG})
-      ENDIF (QT_${basename}_LIBRARY_DEBUG AND QT_${basename}_LIBRARY_RELEASE)
+          set(QT_${basename}_LIBRARY       ${QT_${basename}_LIBRARY_RELEASE} )
+        endif()
+        set(QT_${basename}_LIBRARIES       optimized ${QT_${basename}_LIBRARY_RELEASE} debug ${QT_${basename}_LIBRARY_DEBUG})
+      endif()
 
-      SET(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY} CACHE FILEPATH "The Qt ${basename} library")
+      set(QT_${basename}_LIBRARY ${QT_${basename}_LIBRARY} CACHE FILEPATH "The Qt ${basename} library")
 
       IF (QT_${basename}_LIBRARY)
-        SET(QT_${basename}_FOUND 1)
-      ENDIF (QT_${basename}_LIBRARY)
-    ENDIF (QT_${basename}_LIBRARY_RELEASE OR QT_${basename}_LIBRARY_DEBUG)
+        set(QT_${basename}_FOUND 1)
+      endif()
+    endif()
 
       #add the include directory to QT_INCLUDES
     IF (QT_${basename}_INCLUDE_DIR)
-      SET(QT_INCLUDES ${QT_INCLUDES} "${QT_${basename}_INCLUDE_DIR}")
-    ENDIF (QT_${basename}_INCLUDE_DIR )
+      set(QT_INCLUDES ${QT_INCLUDES} "${QT_${basename}_INCLUDE_DIR}")
+    endif()
 
     # Make variables changeble to the advanced user
     MARK_AS_ADVANCED(QT_${basename}_LIBRARY QT_${basename}_LIBRARY_RELEASE QT_${basename}_LIBRARY_DEBUG QT_${basename}_INCLUDE_DIR)
@@ -644,10 +644,10 @@ IF (QT4_QMAKE_FOUND)
   # platform dependent libraries
   IF(Q_WS_X11)
     _QT4_ADJUST_LIB_VARS(QTMOTIF)
-  ENDIF(Q_WS_X11)
+  endif()
   IF(WIN32)
     _QT4_ADJUST_LIB_VARS(QTMAIN)
-  ENDIF(WIN32)
+  endif()
 
   #######################################
   #
@@ -666,9 +666,9 @@ IF (QT4_QMAKE_FOUND)
   FILE(TO_CMAKE_PATH 
     "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL)
 
-  SET(QT_MOC_EXECUTABLE 
+  set(QT_MOC_EXECUTABLE 
     ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable")
-  SET(QT_UIC_EXECUTABLE 
+  set(QT_UIC_EXECUTABLE 
     ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable")
 
   FIND_PROGRAM(QT_UIC3_EXECUTABLE
@@ -684,12 +684,12 @@ IF (QT4_QMAKE_FOUND)
     )
 
   IF (QT_MOC_EXECUTABLE)
-    SET(QT_WRAP_CPP "YES")
-  ENDIF (QT_MOC_EXECUTABLE)
+    set(QT_WRAP_CPP "YES")
+  endif()
 
   IF (QT_UIC_EXECUTABLE)
-    SET(QT_WRAP_UI "YES")
-  ENDIF (QT_UIC_EXECUTABLE)
+    set(QT_WRAP_UI "YES")
+  endif()
 
 
 
@@ -702,11 +702,11 @@ IF (QT4_QMAKE_FOUND)
   ######################################
 
   MACRO (QT4_GET_MOC_INC_DIRS _moc_INC_DIRS)
-    SET(${_moc_INC_DIRS})
+    set(${_moc_INC_DIRS})
     GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES)
 
     FOREACH(_current ${_inc_DIRS})
-      SET(${_moc_INC_DIRS} ${${_moc_INC_DIRS}} "-I" ${_current})
+      set(${_moc_INC_DIRS} ${${_moc_INC_DIRS}} "-I" ${_current})
     ENDFOREACH(_current ${_inc_DIRS})
   ENDMACRO(QT4_GET_MOC_INC_DIRS)
 
@@ -737,12 +737,12 @@ IF (QT4_QMAKE_FOUND)
       GET_FILENAME_COMPONENT(it ${it} ABSOLUTE)
       GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
 
-      SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cxx)
+      set(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cxx)
       ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
         COMMAND ${QT_MOC_EXECUTABLE}
         ARGS ${moc_includes} -o ${outfile} ${it}
         DEPENDS ${it})
-      SET(${outfiles} ${${outfiles}} ${outfile})
+      set(${outfiles} ${${outfiles}} ${outfile})
     ENDFOREACH(it)
 
   ENDMACRO (QT4_WRAP_CPP)
@@ -755,12 +755,12 @@ IF (QT4_QMAKE_FOUND)
     FOREACH (it ${ARGN})
       GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
       GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
-      SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
+      set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
       ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
         COMMAND ${QT_UIC_EXECUTABLE}
         ARGS -o ${outfile} ${infile}
         MAIN_DEPENDENCY ${infile})
-      SET(${outfiles} ${${outfiles}} ${outfile})
+      set(${outfiles} ${${outfiles}} ${outfile})
     ENDFOREACH (it)
 
   ENDMACRO (QT4_WRAP_UI)
@@ -774,12 +774,12 @@ IF (QT4_QMAKE_FOUND)
     FOREACH (it ${ARGN})
       GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
       GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
-      SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
+      set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
       ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
         COMMAND ${QT_RCC_EXECUTABLE}
         ARGS -name ${outfilename} -o ${outfile} ${infile}
         MAIN_DEPENDENCY ${infile} )
-      SET(${outfiles} ${${outfiles}} ${outfile})
+      set(${outfiles} ${${outfiles}} ${outfile})
     ENDFOREACH (it)
 
   ENDMACRO (QT4_ADD_RESOURCES)
@@ -788,7 +788,7 @@ IF (QT4_QMAKE_FOUND)
   MACRO(QT4_AUTOMOC)
     QT4_GET_MOC_INC_DIRS(_moc_INCS)
 
-    SET(_matching_FILES )
+    set(_matching_FILES )
     FOREACH (_current_FILE ${ARGN})
 
       GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
@@ -813,9 +813,9 @@ IF (QT4_QMAKE_FOUND)
             STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
 
             GET_filename_component(_basename ${_current_MOC} NAME_WE)
-            # SET(_header ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.h)
-            SET(_header ${_abs_PATH}/${_basename}.h)
-            SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
+            # set(_header ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.h)
+            set(_header ${_abs_PATH}/${_basename}.h)
+            set(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
             ADD_CUSTOM_COMMAND(OUTPUT ${_moc}
               COMMAND ${QT_MOC_EXECUTABLE}
               ARGS ${_moc_INCS} ${_header} -o ${_moc}
@@ -824,8 +824,8 @@ IF (QT4_QMAKE_FOUND)
 
             MACRO_ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc})
           ENDFOREACH (_current_MOC_INC)
-        ENDIF(_match)
-      ENDIF ( NOT _skip AND EXISTS ${_abs_FILE} )
+        endif()
+      endif()
     ENDFOREACH (_current_FILE)
   ENDMACRO(QT4_AUTOMOC)
 
@@ -839,17 +839,17 @@ IF (QT4_QMAKE_FOUND)
 
   # if the includes,libraries,moc,uic and rcc are found then we have it
   IF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
-    SET( QT4_FOUND "YES" )
+    set( QT4_FOUND "YES" )
     IF( NOT Qt4_FIND_QUIETLY)
-      MESSAGE(STATUS "Found Qt-Version ${QTVERSION}")
-    ENDIF( NOT Qt4_FIND_QUIETLY)
-  ELSE( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND QT_RCC_EXECUTABLE)
-    SET( QT4_FOUND "NO")
+      message(STATUS "Found Qt-Version ${QTVERSION}")
+    endif()
+  else()
+    set( QT4_FOUND "NO")
     IF( Qt4_FIND_REQUIRED)
-      MESSAGE( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
-    ENDIF( Qt4_FIND_REQUIRED)
-  ENDIF( QT_LIBRARY_DIR AND QT_INCLUDE_DIR AND QT_MOC_EXECUTABLE AND QT_UIC_EXECUTABLE AND  QT_RCC_EXECUTABLE)
-  SET(QT_FOUND ${QT4_FOUND})
+      message( FATAL_ERROR "Qt libraries, includes, moc, uic or/and rcc NOT found!")
+    endif()
+  endif()
+  set(QT_FOUND ${QT4_FOUND})
   
   #######################################
   #
@@ -860,7 +860,7 @@ IF (QT4_QMAKE_FOUND)
     FILE(READ ${QT_MKSPECS_DIR}/qconfig.pri _qconfig_FILE_contents)
     STRING(REGEX MATCH "QT_CONFIG[^\n]+" QT_QCONFIG ${_qconfig_FILE_contents})
     STRING(REGEX MATCH "CONFIG[^\n]+" QT_CONFIG ${_qconfig_FILE_contents})
-  ENDIF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
+  endif()
 
 
   ###############################################
@@ -869,94 +869,94 @@ IF (QT4_QMAKE_FOUND)
   #
   ###############################################
 
-  SET(QT_GUI_LIB_DEPENDENCIES "")
-  SET(QT_CORE_LIB_DEPENDENCIES "")
+  set(QT_GUI_LIB_DEPENDENCIES "")
+  set(QT_CORE_LIB_DEPENDENCIES "")
   
   # shared build needs -DQT_SHARED
   IF(NOT QT_CONFIG MATCHES "static")
     # warning currently only qconfig.pri on Windows potentially contains "static"
     # so QT_SHARED might not get defined properly on Mac/X11 (which seems harmless right now)
     # Trolltech said they'd consider exporting it for all platforms in future releases.
-    SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_SHARED)
-  ENDIF(NOT QT_CONFIG MATCHES "static")
+    set(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_SHARED)
+  endif()
   
   ## system png
   IF(QT_QCONFIG MATCHES "system-png")
     FIND_LIBRARY(QT_PNG_LIBRARY NAMES png)
-    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_PNG_LIBRARY})
+    set(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_PNG_LIBRARY})
     MARK_AS_ADVANCED(QT_PNG_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "system-png")
+  endif()
   
   # for X11, get X11 library directory
   IF(Q_WS_X11)
     QT_QUERY_QMAKE(QMAKE_LIBDIR_X11 "QMAKE_LIBDIR_X11")
-  ENDIF(Q_WS_X11)
+  endif()
 
   ## X11 SM
   IF(QT_QCONFIG MATCHES "x11sm")
     # ask qmake where the x11 libs are
     FIND_LIBRARY(QT_X11_SM_LIBRARY NAMES SM PATHS ${QMAKE_LIBDIR_X11})
     FIND_LIBRARY(QT_X11_ICE_LIBRARY NAMES ICE PATHS ${QMAKE_LIBDIR_X11})
-    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_X11_SM_LIBRARY} ${QT_X11_ICE_LIBRARY})
+    set(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_X11_SM_LIBRARY} ${QT_X11_ICE_LIBRARY})
     MARK_AS_ADVANCED(QT_X11_SM_LIBRARY)
     MARK_AS_ADVANCED(QT_X11_ICE_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "x11sm")
+  endif()
   
   ## Xi
   IF(QT_QCONFIG MATCHES "tablet")
     FIND_LIBRARY(QT_XI_LIBRARY NAMES Xi PATHS ${QMAKE_LIBDIR_X11})
-    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XI_LIBRARY})
+    set(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XI_LIBRARY})
     MARK_AS_ADVANCED(QT_XI_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "tablet")
+  endif()
 
   ## Xrender
   IF(QT_QCONFIG MATCHES "xrender")
     FIND_LIBRARY(QT_XRENDER_LIBRARY NAMES Xrender PATHS ${QMAKE_LIBDIR_X11})
-    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XRENDER_LIBRARY})
+    set(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XRENDER_LIBRARY})
     MARK_AS_ADVANCED(QT_XRENDER_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "xrender")
+  endif()
   
   ## Xrandr
   IF(QT_QCONFIG MATCHES "xrandr")
     FIND_LIBRARY(QT_XRANDR_LIBRARY NAMES Xrandr PATHS ${QMAKE_LIBDIR_X11})
-    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XRANDR_LIBRARY})
+    set(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XRANDR_LIBRARY})
     MARK_AS_ADVANCED(QT_XRANDR_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "xrandr")
+  endif()
   
   ## Xcursor
   IF(QT_QCONFIG MATCHES "xcursor")
     FIND_LIBRARY(QT_XCURSOR_LIBRARY NAMES Xcursor PATHS ${QMAKE_LIBDIR_X11})
-    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XCURSOR_LIBRARY})
+    set(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XCURSOR_LIBRARY})
     MARK_AS_ADVANCED(QT_XCURSOR_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "xcursor")
+  endif()
   
   ## Xinerama
   IF(QT_QCONFIG MATCHES "xinerama")
     FIND_LIBRARY(QT_XINERAMA_LIBRARY NAMES Xinerama PATHS ${QMAKE_LIBDIR_X11})
-    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XINERAMA_LIBRARY})
+    set(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XINERAMA_LIBRARY})
     MARK_AS_ADVANCED(QT_XINERAMA_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "xinerama")
+  endif()
   
   ## system-freetype
   IF(QT_QCONFIG MATCHES "system-freetype")
     FIND_LIBRARY(QT_FREETYPE_LIBRARY NAMES freetype)
-    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_FREETYPE_LIBRARY})
+    set(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_FREETYPE_LIBRARY})
     MARK_AS_ADVANCED(QT_FREETYPE_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "system-freetype")
+  endif()
   
   ## fontconfig
   IF(QT_QCONFIG MATCHES "fontconfig")
     FIND_LIBRARY(QT_FONTCONFIG_LIBRARY NAMES fontconfig)
-    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_FONTCONFIG_LIBRARY})
+    set(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_FONTCONFIG_LIBRARY})
     MARK_AS_ADVANCED(QT_FONTCONFIG_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "fontconfig")
+  endif()
   
   ## system-zlib
   IF(QT_QCONFIG MATCHES "system-zlib")
     FIND_LIBRARY(QT_ZLIB_LIBRARY NAMES z)
-    SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_ZLIB_LIBRARY})
+    set(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_ZLIB_LIBRARY})
     MARK_AS_ADVANCED(QT_ZLIB_LIBRARY)
-  ENDIF(QT_QCONFIG MATCHES "system-zlib")
+  endif()
 
   IF(Q_WS_X11)
     # X11 libraries Qt absolutely depends on
@@ -964,28 +964,28 @@ IF (QT4_QMAKE_FOUND)
     SEPARATE_ARGUMENTS(QT_LIBS_X11)
     FOREACH(QT_X11_LIB ${QT_LIBS_X11})
       STRING(REGEX REPLACE "-l" "" QT_X11_LIB "${QT_X11_LIB}")
-      SET(QT_TMP_STR "QT_X11_${QT_X11_LIB}_LIBRARY")
+      set(QT_TMP_STR "QT_X11_${QT_X11_LIB}_LIBRARY")
       FIND_LIBRARY(${QT_TMP_STR} NAMES "${QT_X11_LIB}" PATHS ${QMAKE_LIBDIR_X11})
-      SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${${QT_TMP_STR}})
+      set(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${${QT_TMP_STR}})
     ENDFOREACH(QT_X11_LIB)
 
     QT_QUERY_QMAKE(QT_LIBS_THREAD "QMAKE_LIBS_THREAD")
-    SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_LIBS_THREAD})
+    set(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_LIBS_THREAD})
     
     QT_QUERY_QMAKE(QMAKE_LIBS_DYNLOAD "QMAKE_LIBS_DYNLOAD")
-    SET (QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QMAKE_LIBS_DYNLOAD})
+    set(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QMAKE_LIBS_DYNLOAD})
 
-  ENDIF(Q_WS_X11)
+  endif()
   
   IF(Q_WS_WIN)
-    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} Imm32 Winmm)
-    SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} Ws2_32)
-  ENDIF(Q_WS_WIN)
+    set(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} Imm32 Winmm)
+    set(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} Ws2_32)
+  endif()
   
   IF(Q_WS_MAC)
-    SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} "-framework Carbon" "-framework QuickTime")
-    SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} "-framework ApplicationServices")
-  ENDIF(Q_WS_MAC)
+    set(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} "-framework Carbon" "-framework QuickTime")
+    set(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} "-framework ApplicationServices")
+  endif()
 
   #######################################
   #
@@ -993,24 +993,24 @@ IF (QT4_QMAKE_FOUND)
   #
   #######################################
   # Backwards compatibility for CMake1.4 and 1.2
-  SET (QT_MOC_EXE ${QT_MOC_EXECUTABLE} )
-  SET (QT_UIC_EXE ${QT_UIC_EXECUTABLE} )
+  set(QT_MOC_EXE ${QT_MOC_EXECUTABLE} )
+  set(QT_UIC_EXE ${QT_UIC_EXECUTABLE} )
 
-  SET( QT_QT_LIBRARY "")
+  set( QT_QT_LIBRARY "")
 
-ELSE(QT4_QMAKE_FOUND)
+else()
 
   IF(Qt4_FIND_REQUIRED)
     IF(QT4_INSTALLED_VERSION_TOO_OLD)
-      MESSAGE(FATAL_ERROR "The installed Qt version ${QTVERSION} is too old, at least version ${QT_MIN_VERSION} is required")
-    ELSE(QT4_INSTALLED_VERSION_TOO_OLD)
-      MESSAGE( FATAL_ERROR "Qt qmake not found!")
-    ENDIF(QT4_INSTALLED_VERSION_TOO_OLD)
-  ELSE(Qt4_FIND_REQUIRED)
+      message(FATAL_ERROR "The installed Qt version ${QTVERSION} is too old, at least version ${QT_MIN_VERSION} is required")
+    else()
+      message( FATAL_ERROR "Qt qmake not found!")
+    endif()
+  else()
     IF(QT4_INSTALLED_VERSION_TOO_OLD AND NOT Qt4_FIND_QUIETLY)
-      MESSAGE(STATUS "The installed Qt version ${QTVERSION} is too old, at least version ${QT_MIN_VERSION} is required")
-    ENDIF(QT4_INSTALLED_VERSION_TOO_OLD AND NOT Qt4_FIND_QUIETLY)
-  ENDIF(Qt4_FIND_REQUIRED)
+      message(STATUS "The installed Qt version ${QTVERSION} is too old, at least version ${QT_MIN_VERSION} is required")
+    endif()
+  endif()
   
-ENDIF (QT4_QMAKE_FOUND)
+endif()
 
diff --git a/development/cmake/modules/FindZLIB.cmake b/development/cmake/modules/FindZLIB.cmake
index 61d85c18d2..9821a6d92d 100644
--- a/development/cmake/modules/FindZLIB.cmake
+++ b/development/cmake/modules/FindZLIB.cmake
@@ -4,7 +4,7 @@
 if (ZLIB_INCLUDE_DIR)
   # Already in cache, be silent
   set(ZLIB_FIND_QUIETLY TRUE)
-endif (ZLIB_INCLUDE_DIR)
+endif()
 
 FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
  /usr/include
@@ -20,19 +20,19 @@ PATHS
 )
 
 IF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
-   SET(ZLIB_FOUND TRUE)
-ENDIF (ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
+   set(ZLIB_FOUND TRUE)
+endif()
 
 IF (ZLIB_FOUND)
    IF (NOT ZLIB_FIND_QUIETLY)
-      MESSAGE(STATUS "Found Z: ${ZLIB_LIBRARY}")
-   ENDIF (NOT ZLIB_FIND_QUIETLY)
-ELSE (ZLIB_FOUND)
+      message(STATUS "Found Z: ${ZLIB_LIBRARY}")
+   endif()
+else()
    IF (ZLIB_FIND_REQUIRED)
-      MESSAGE(STATUS "Looked for Z libraries named ${POTENTIAL_Z_LIBS}.")
-      MESSAGE(STATUS "Found no acceptable Z library. This is fatal.")
-      MESSAGE(FATAL_ERROR "Could NOT find z library")
-   ENDIF (ZLIB_FIND_REQUIRED)
-ENDIF (ZLIB_FOUND)
+      message(STATUS "Looked for Z libraries named ${POTENTIAL_Z_LIBS}.")
+      message(STATUS "Found no acceptable Z library. This is fatal.")
+      message(FATAL_ERROR "Could NOT find z library")
+   endif()
+endif()
 
 MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake
index 43b1fd8bf3..609e830995 100644
--- a/development/cmake/modules/LyXMacros.cmake
+++ b/development/cmake/modules/LyXMacros.cmake
@@ -66,7 +66,7 @@ endmacro (LYX_ADD_UI_FILES)
 MACRO (LYX_AUTOMOC)
    if(QT4_GET_MOC_INC_DIRS)
       QT4_GET_MOC_INC_DIRS(_moc_INCS)
-   endif(QT4_GET_MOC_INC_DIRS)
+   endif()
 
    set(_matching_FILES )
    foreach (_current_FILE ${ARGN})
@@ -117,11 +117,11 @@ MACRO (LYX_AUTOMOC)
                macro_add_file_dependencies(${_abs_FILE} ${_moc})
 
             endforeach (_current_MOC_INC)
-         else(_match)
+         else()
          	#message(STATUS "moc not found : ${_abs_FILE} ")
-         endif (_match)
+         endif()
 
-      endif (EXISTS ${_abs_FILE} AND NOT _skip)
+      endif()
    endforeach (_current_FILE)
 endmacro (LYX_AUTOMOC)
 
@@ -137,32 +137,32 @@ macro(lyx_const_touched_files _allinone_name _list)
    set(_rebuild_file_const 0)
    if (NOT EXISTS ${_file_const})
       set(_rebuild_file_const 1)
-   else (NOT EXISTS ${_file_const})
+   else()
       FILE(READ ${_file_const} _file_content)
       if (NOT _file_content)
          set(_rebuild_file_const 1)
-      endif (NOT _file_content)
-   endif (NOT EXISTS ${_file_const})
+      endif()
+   endif()
    
    set(_rebuild_file_touched 0)
    if (NOT EXISTS ${_file_touched})
       set(_rebuild_file_touched 1)
-   else (NOT EXISTS ${_file_touched})
+   else()
       FILE(READ ${_file_touched} _file_content)
       if (NOT _file_content)
          set(_rebuild_file_touched 1)
-      endif (NOT _file_content)   
-   endif (NOT EXISTS ${_file_touched})
+      endif()   
+   endif()
    
    if (merge_rebuild)
       set(_rebuild_file_const 1)
       set(_rebuild_file_touched 1)
-   endif (merge_rebuild)
+   endif()
    
    if (_rebuild_file_const)
       file(WRITE  ${_file_const} "// autogenerated file \n//\n")
       file(APPEND ${_file_const} "//    * clear or delete this file to build it again by cmake \n//\n\n")
-   endif (_rebuild_file_const)
+   endif()
 
    if (_rebuild_file_touched)
       file(WRITE  ${_file_touched} "// autogenerated file \n//\n")
@@ -170,7 +170,7 @@ macro(lyx_const_touched_files _allinone_name _list)
       file(APPEND ${_file_touched} "//    * don't touch this file \n//\n\n")
       file(APPEND ${_file_touched} "#define DONT_INCLUDE_CONST_FILES\n")
       file(APPEND ${_file_touched} "#include \"${_file_const}\"\n\n\n")
-   endif (_rebuild_file_touched)
+   endif()
    
    set(${_file_list} ${_file_const} ${_file_touched})
    
@@ -181,7 +181,7 @@ macro(lyx_const_touched_files _allinone_name _list)
       get_source_file_property(_isGenerated ${_abs_FILE} GENERATED)
       if (_isGenerated)
          list(APPEND ${_file_list} ${_abs_FILE})
-      else (_isGenerated)
+      else()
         GET_FILENAME_COMPONENT(_file_name ${_abs_FILE} NAME_WE)
         STRING(REGEX REPLACE "-" "_" _file_name "${_file_name}" )
         set(__macro_name ${_file_name}___ASSUME_CONST)
@@ -191,14 +191,14 @@ macro(lyx_const_touched_files _allinone_name _list)
            file(APPEND ${_file_const}  "#if defined(${__macro_name}) && !defined(DONT_INCLUDE_CONST_FILES)\n")
            file(APPEND ${_file_const}  "#include \"${_abs_FILE}\"\n")
            file(APPEND ${_file_const}  "#endif\n\n")
-        endif (_rebuild_file_const)
+        endif()
         
         if (_rebuild_file_touched)
            file(APPEND ${_file_touched}  "#ifndef ${__macro_name}\n")
            file(APPEND ${_file_touched}  "#include \"${_abs_FILE}\"\n")
            file(APPEND ${_file_touched}  "#endif\n\n")
-        endif (_rebuild_file_touched)
-      endif (_isGenerated)
+        endif()
+      endif()
    endforeach (_current_FILE)
 endmacro(lyx_const_touched_files)
 
diff --git a/development/cmake/modules/LyXuic.cmake b/development/cmake/modules/LyXuic.cmake
index b51b1eae64..87782654f1 100644
--- a/development/cmake/modules/LyXuic.cmake
+++ b/development/cmake/modules/LyXuic.cmake
@@ -36,7 +36,7 @@ set(KDE_UIC_CPP_FILE ${KDE_UIC_H_FILE})
 
 if(WIN32)
     STRING(REGEX REPLACE "\r" "" _uic_CONTENTS "${_uic_CONTENTS}" )
-endif(WIN32)
+endif()
 
 FILE(WRITE ${KDE_UIC_CPP_FILE} "${_uic_CONTENTS}\n")
 
diff --git a/development/cmake/modules/ProjectSourceGroup.cmake b/development/cmake/modules/ProjectSourceGroup.cmake
index 0b58a17edb..0922cf3647 100644
--- a/development/cmake/modules/ProjectSourceGroup.cmake
+++ b/development/cmake/modules/ProjectSourceGroup.cmake
@@ -37,10 +37,10 @@ macro(project_source_group mode sources headers)
 		source_group("Source Files" Files)
 		source_group("Header Files" Files)
 		source_group("cmake" FILES CMakeLists.txt)
-	else(${mode} MATCHES "flat")
+	else()
 		if(NOT ${mode} MATCHES "split")
 			source_group("${mode}" FILES ${${sources}} ${${headers}})
-		endif(NOT ${mode} MATCHES "split")
-	endif(${mode} MATCHES "flat")
+		endif()
+	endif()
 endmacro(project_source_group mode sources headers)
 
diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index 63ad5ae2a0..965a48cf9a 100644
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -16,7 +16,6 @@ add_subdirectory(support)
 add_subdirectory(tex2lyx) 
 
 
-
 file(GLOB lyx_sources ${TOP_SRC_DIR}/src/${LYX_CPP_FILES})
 file(GLOB lyx_headers ${TOP_SRC_DIR}/src/${LYX_HPP_FILES})
 
diff --git a/development/cmake/src/frontends/controllers/CMakeLists.txt b/development/cmake/src/frontends/controllers/CMakeLists.txt
index 3d0183a4ee..5798106d3f 100644
--- a/development/cmake/src/frontends/controllers/CMakeLists.txt
+++ b/development/cmake/src/frontends/controllers/CMakeLists.txt
@@ -15,10 +15,10 @@ include_directories(${TOP_SRC_DIR}/src/frontends/controllers)
 
 if(NOT MERGE_FILES)
 	add_library(controllers ${library_type} ${controllers_sources} ${controllers_headers})
-else(NOT MERGE_FILES)
+else()
 	lyx_const_touched_files(_allinone  controllers_sources)
 	add_library(controllers ${library_type} ${_allinone_files})
-endif(NOT MERGE_FILES)
+endif()
 
 target_link_libraries(controllers boost_regex boost_filesystem)
 
diff --git a/development/cmake/src/frontends/qt4/CMakeLists.txt b/development/cmake/src/frontends/qt4/CMakeLists.txt
index 9a0f3e0537..05541afc66 100644
--- a/development/cmake/src/frontends/qt4/CMakeLists.txt
+++ b/development/cmake/src/frontends/qt4/CMakeLists.txt
@@ -6,10 +6,12 @@
 
 project(frontend_qt4)
 
-
-file(GLOB frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_CPP_FILES})
-file(GLOB frontends_qt4_headers ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_HPP_FILES})
-file(GLOB frontend_qt4_UI       ${TOP_SRC_DIR}/src/frontends/qt4/ui/*.ui)
+file(GLOB frontends_qt4_sources
+	${TOP_SRC_DIR}/src/frontends/qt4/${LYX_CPP_FILES})
+file(GLOB frontends_qt4_headers
+	${TOP_SRC_DIR}/src/frontends/qt4/${LYX_HPP_FILES})
+file(GLOB frontend_qt4_UI
+	${TOP_SRC_DIR}/src/frontends/qt4/ui/*.ui)
 
 lyx_add_msvc_pch(frontends_qt4)
 
@@ -17,42 +19,45 @@ lyx_automoc(${frontends_qt4_sources})
 
 lyx_add_ui_files(frontends_qt4_sources ui_files ${frontend_qt4_UI})
 
-add_definitions(
-		-DQT_GENUINE_STR
-		-DLYX_BUILD_QT4_FRONTEND
-		)
-
+add_definitions(-DQT_GENUINE_STR -DLYX_BUILD_QT4_FRONTEND)
 
 include_directories(	
-			${TOP_SRC_DIR}/src/frontends/qt4 
-			${TOP_SRC_DIR}/src/frontends/controllers
-			${CMAKE_CURRENT_BINARY_DIR})
+	${TOP_SRC_DIR}/src/frontends/qt4 
+	${TOP_SRC_DIR}/src/frontends/controllers
+	${CMAKE_CURRENT_BINARY_DIR})
 
 if(MERGE_FILES)
-	list(REMOVE_ITEM frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/QCommandEdit.cpp)
-	list(APPEND frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/QCommandEdit.cpp)
+	list(REMOVE_ITEM frontends_qt4_sources
+		${TOP_SRC_DIR}/src/frontends/qt4/QCommandEdit.cpp)
+	list(APPEND frontends_qt4_sources
+		${TOP_SRC_DIR}/src/frontends/qt4/QCommandEdit.cpp)
 	list(REVERSE frontends_qt4_sources)
-	list(REMOVE_ITEM frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/GuiApplication.cpp)
-	list(APPEND frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/GuiApplication.cpp)
+	list(REMOVE_ITEM frontends_qt4_sources
+		${TOP_SRC_DIR}/src/frontends/qt4/GuiApplication.cpp)
+	list(APPEND frontends_qt4_sources
+		${TOP_SRC_DIR}/src/frontends/qt4/GuiApplication.cpp)
 	lyx_const_touched_files(_allinone frontends_qt4_sources)
 	set(depends_moc_uic ${frontends_qt4_headers} ${ui_files})
-	SET_SOURCE_FILES_PROPERTIES(_allinone_const.C PROPERTIES OBJECT_DEPENDS "${depends_moc_uic}")
-	SET_SOURCE_FILES_PROPERTIES(_allinone_touched.C PROPERTIES OBJECT_DEPENDS "${depends_moc_uic}")
+	set_source_files_properties(_allinone_const.C
+		PROPERTIES OBJECT_DEPENDS "${depends_moc_uic}")
+	set_source_files_properties(_allinone_touched.C
+		PROPERTIES OBJECT_DEPENDS "${depends_moc_uic}")
 	add_library(frontend_qt4 ${library_type} 
-					${_allinone_files}
-					${frontends_qt4_headers} 
-					${ui_files}
-	)
-else(MERGE_FILES)	
-	add_library(frontend_qt4 ${library_type}  ${frontends_qt4_sources} ${frontends_qt4_headers} ${ui_files})
-endif(MERGE_FILES)
+		${_allinone_files} ${frontends_qt4_headers} ${ui_files})
+else()
+	add_library(frontend_qt4 ${library_type}
+		${frontends_qt4_sources} ${frontends_qt4_headers} ${ui_files})
+endif()
 
-target_link_libraries(frontend_qt4 ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} controllers)
+target_link_libraries(frontend_qt4
+	${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} controllers)
 
 if(WIN32)
 	target_link_libraries(frontend_qt4 Gdi32)
-endif(WIN32)
+endif()
+
+project_source_group("${GROUP_CODE}"
+	frontends_qt4_sources frontends_qt4_headers)
 
-project_source_group("${GROUP_CODE}" frontends_qt4_sources frontends_qt4_headers)
 source_group("Uic files" FILES ${frontend_qt4_UI})
 
diff --git a/development/cmake/src/graphics/CMakeLists.txt b/development/cmake/src/graphics/CMakeLists.txt
index 15270a9768..e3855ad8db 100644
--- a/development/cmake/src/graphics/CMakeLists.txt
+++ b/development/cmake/src/graphics/CMakeLists.txt
@@ -16,10 +16,10 @@ include_directories(${TOP_SRC_DIR}/src/graphics)
 
 if(NOT MERGE_FILES)
 	add_library(graphics ${library_type} ${graphics_sources} ${graphics_headers})
-else(NOT MERGE_FILES)
+else()
 	lyx_const_touched_files(_allinone  graphics_sources)
 	add_library(graphics ${library_type} ${_allinone_files})
-endif(NOT MERGE_FILES)
+endif()
 
 project_source_group("${GROUP_CODE}" graphics_sources graphics_headers)
 
diff --git a/development/cmake/src/insets/CMakeLists.txt b/development/cmake/src/insets/CMakeLists.txt
index 5faf03a088..c86faf58d0 100644
--- a/development/cmake/src/insets/CMakeLists.txt
+++ b/development/cmake/src/insets/CMakeLists.txt
@@ -18,10 +18,10 @@ include_directories(${TOP_SRC_DIR}/src/insets)
 
 if(NOT MERGE_FILES)
 	add_library(insets ${library_type} ${insets_sources} ${insets_headers})
-else(NOT MERGE_FILES)
+else()
 	lyx_const_touched_files(_allinone  insets_sources)
 	add_library(insets ${library_type} ${_allinone_files})
-endif(NOT MERGE_FILES)
+endif()
 
 
 project_source_group("${GROUP_CODE}" insets_sources insets_headers)
diff --git a/development/cmake/src/mathed/CMakeLists.txt b/development/cmake/src/mathed/CMakeLists.txt
index 3087f96572..654346a290 100644
--- a/development/cmake/src/mathed/CMakeLists.txt
+++ b/development/cmake/src/mathed/CMakeLists.txt
@@ -19,11 +19,10 @@ include_directories(${TOP_SRC_DIR}/src/mathed)
 
 if(NOT MERGE_FILES)
 	add_library(mathed ${library_type} ${mathed_sources} ${mathed_headers})
-else(NOT MERGE_FILES)
+else()
 	lyx_const_touched_files(_allinone  mathed_sources)
 	add_library(mathed ${library_type} ${_allinone_files})
-endif(NOT MERGE_FILES)
-
+endif()
 
 project_source_group("${GROUP_CODE}" mathed_sources mathed_headers)
 
diff --git a/development/cmake/src/support/CMakeLists.txt b/development/cmake/src/support/CMakeLists.txt
index 594af5dcc0..b7aadf581e 100644
--- a/development/cmake/src/support/CMakeLists.txt
+++ b/development/cmake/src/support/CMakeLists.txt
@@ -29,14 +29,15 @@ list(REMOVE_ITEM support_sources
 
 lyx_add_msvc_pch(support)
 	
-include_directories(${TOP_SRC_DIR}/src/support ${TOP_SRC_DIR}/src/support/minizip ${ICONV_INCLUDE_DIR})
+include_directories(${TOP_SRC_DIR}/src/support
+	${TOP_SRC_DIR}/src/support/minizip ${ICONV_INCLUDE_DIR})
 
 
 if(NOT MERGE_FILES)
 	set(support_sources ${support_sources} ${support_minzip_sources})
 	set(support_headers ${support_headers} ${support_minzip_headers})
 	add_library(support ${library_type} ${support_sources} ${support_headers})
-else(NOT MERGE_FILES)
+else()
 	# move to front
 	list(REMOVE_ITEM support_sources ${TOP_SRC_DIR}/src/support/convert.cpp)
 	list(APPEND support_sources ${TOP_SRC_DIR}/src/support/convert.cpp)
@@ -44,15 +45,16 @@ else(NOT MERGE_FILES)
 	list(APPEND support_sources ${TOP_SRC_DIR}/src/support/lstrings.cpp)
 	list(REVERSE support_sources)
 	lyx_const_touched_files(_allinone  support_sources)
-	add_library(support ${library_type} ${_allinone_files} ${support_minzip_sources})
-endif(NOT MERGE_FILES)
+	add_library(support ${library_type} ${_allinone_files}
+		${support_minzip_sources})
+endif()
 
 
 target_link_libraries(support boost_signals)
 
 if(WIN32)
 	target_link_libraries(support shlwapi)
-endif(WIN32)
+endif()
 
 project_source_group("${GROUP_CODE}" support_sources support_headers)
 
diff --git a/development/cmake/src/tex2lyx/CMakeLists.txt b/development/cmake/src/tex2lyx/CMakeLists.txt
index 4fd9e7a907..56fe951f32 100644
--- a/development/cmake/src/tex2lyx/CMakeLists.txt
+++ b/development/cmake/src/tex2lyx/CMakeLists.txt
@@ -6,8 +6,6 @@
 
 project(tex2lyx)
 
-
-
 set(LINKED_sources
 	${TOP_SRC_DIR}/src/FloatList.cpp
 	${TOP_SRC_DIR}/src/Floating.cpp
@@ -15,12 +13,11 @@ set(LINKED_sources
 	${TOP_SRC_DIR}/src/Layout.cpp
 	${TOP_SRC_DIR}/src/TextClass.cpp
 	${TOP_SRC_DIR}/src/Lexer.cpp
-)
+	${TOP_SRC_DIR}/src/Color.cpp)
 
 set(LINKED_headers
 	${TOP_SRC_DIR}/src/Layout.h
-	${TOP_SRC_DIR}/src/TextClass.h
-)
+	${TOP_SRC_DIR}/src/TextClass.h)
 
 set(tex2lyx_sources
 	${TOP_SRC_DIR}/src/tex2lyx/boost.cpp
@@ -33,28 +30,28 @@ set(tex2lyx_sources
 	${TOP_SRC_DIR}/src/tex2lyx/preamble.cpp
 	${TOP_SRC_DIR}/src/tex2lyx/math.cpp
 	${TOP_SRC_DIR}/src/tex2lyx/table.cpp
-	${TOP_SRC_DIR}/src/tex2lyx/text.cpp
-)
+	${TOP_SRC_DIR}/src/tex2lyx/text.cpp)
 
 set(tex2lyx_headers
 	${TOP_SRC_DIR}/src/tex2lyx/Spacing.h
 	${TOP_SRC_DIR}/src/tex2lyx/Context.h
 	${TOP_SRC_DIR}/src/tex2lyx/Font.h
 	${TOP_SRC_DIR}/src/tex2lyx/Parser.h
-	${TOP_SRC_DIR}/src/tex2lyx/tex2lyx.h
-)
+	${TOP_SRC_DIR}/src/tex2lyx/tex2lyx.h)
 
-include_directories(BEFORE ${TOP_SRC_DIR}/src/tex2lyx ${TOP_SRC_DIR}/src/support/minizip ${ZLIB_INCLUDE_DIR})
+include_directories(BEFORE ${TOP_SRC_DIR}/src/tex2lyx
+	${TOP_SRC_DIR}/src/support/minizip ${ZLIB_INCLUDE_DIR})
 
 add_definitions(-DTEX2LYX)
 
 if(NOT MERGE_FILES)
-	add_executable(tex2lyx ${tex2lyx_sources} ${LINKED_sources} ${tex2lyx_headers} ${LINKED_headers})
-else(NOT MERGE_FILES)
+	add_executable(tex2lyx ${tex2lyx_sources} ${LINKED_sources}
+		${tex2lyx_headers} ${LINKED_headers})
+else()
 	lyx_const_touched_files(_allinone  tex2lyx_sources)
 	lyx_const_touched_files(_allinone_linked  LINKED_sources)
 	add_executable(tex2lyx  ${_allinone_files} ${_allinone_linked_files})
-endif(NOT MERGE_FILES)
+endif()
 
 
 target_link_libraries(tex2lyx  
@@ -63,16 +60,15 @@ target_link_libraries(tex2lyx
 	boost_filesystem
 	boost_regex
 	${QT_QTCORE_LIBRARY} 
-	intl
-	)
+	intl)
 	
 if(WIN32)
 	target_link_libraries(tex2lyx shlwapi)
-endif(WIN32)
+endif()
 
 if(APPLE)
 	target_link_libraries(tex2lyx "-framework Carbon")
-endif(APPLE)
+endif()
 
 project_source_group("${GROUP_CODE}" tex2lyx_sources tex2lyx_headers)