Global reformat whitespaces in cmake files.

(only and only whitespaces affected, no essential changes)

CMakeLists.txt

@@ -1,318 +1,318 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required ( VERSION 2.8 )
 
-FOREACH (policy CMP0012 CMP0013 CMP0014)
-	IF (POLICY ${policy})
-		CMAKE_POLICY (SET ${policy} NEW)
+FOREACH ( policy CMP0012 CMP0013 CMP0014 )
+	IF ( POLICY ${policy} )
+		CMAKE_POLICY ( SET ${policy} NEW )
 	ENDIF ()
 ENDFOREACH ()
 
 # override default options which affects windows builds
 # that is necessary to change /MD to /MT, and also to set libraries on win to implicitly defined
-set (CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake)
-set (CMAKE_USER_MAKE_RULES_OVERRIDE_CXX ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_flag_overrides.cmake)
+set ( CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake )
+set ( CMAKE_USER_MAKE_RULES_OVERRIDE_CXX ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_flag_overrides.cmake )
 
 # set default build type to RelWithDebInfo (if nothing else provided from outside yet)
-IF (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-	SET (CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE)
-	set_property (CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release"
-			"MinSizeRel" "RelWithDebInfo")
+IF ( NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES )
+	SET ( CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE )
+	set_property ( CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release"
+			"MinSizeRel" "RelWithDebInfo" )
 ENDIF ()
 
-PROJECT (SPHINXSEARCH)
-SET (SPHINXSEARCH_CMAKE_DIR "${SPHINXSEARCH_SOURCE_DIR}/cmake")
-SET (CMAKE_MODULE_PATH "${SPHINXSEARCH_SOURCE_DIR}/cmake")
-SET (EXTRA_LIBRARIES)
-SET (BANNER)
-list (APPEND BANNER "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
+PROJECT ( SPHINXSEARCH )
+SET ( SPHINXSEARCH_CMAKE_DIR "${SPHINXSEARCH_SOURCE_DIR}/cmake" )
+SET ( CMAKE_MODULE_PATH "${SPHINXSEARCH_SOURCE_DIR}/cmake" )
+SET ( EXTRA_LIBRARIES )
+SET ( BANNER )
+list ( APPEND BANNER "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" )
 
-set (SPHINX_TAG "" CACHE STRING "The tag which will be added to build")
-set (SPHINX_PACKAGE_SUFFIX "")
+set ( SPHINX_TAG "" CACHE STRING "The tag which will be added to build" )
+set ( SPHINX_PACKAGE_SUFFIX "" )
 
-if (WIN32)
+if ( WIN32 )
 	# on Win we skip all the tests and just use pre-defined folder
-	include (select_library_dir)
-	include (CMakeDependentOption)
+	include ( select_library_dir )
+	include ( CMakeDependentOption )
 	#	expat iconv mysql pq
-	if (HAVE_expat)
-		option (WITH_EXPAT "compile with libexpat support" ON)
-		if (WITH_EXPAT)
-			set (USE_LIBEXPAT 1)
-			include_directories (${expat_INCLUDE})
-			CMAKE_DEPENDENT_OPTION (DL_EXPAT "load expat library dynamically" OFF "USE_LIBEXPAT" ON)
-			if (DL_EXPAT)
-				set (DL_EXPAT 1)
-				set (EXPAT_LIB libexpat.dll)
-			else( DL_EXPAT )
-				list (APPEND EXTRA_LIBRARIES ${expat_LIB})
+	if ( HAVE_expat )
+		option ( WITH_EXPAT "compile with libexpat support" ON )
+		if ( WITH_EXPAT )
+			set ( USE_LIBEXPAT 1 )
+			include_directories ( ${expat_INCLUDE} )
+			CMAKE_DEPENDENT_OPTION ( DL_EXPAT "load expat library dynamically" OFF "USE_LIBEXPAT" ON )
+			if ( DL_EXPAT )
+				set ( DL_EXPAT 1 )
+				set ( EXPAT_LIB libexpat.dll )
+			else ( DL_EXPAT )
+				list ( APPEND EXTRA_LIBRARIES ${expat_LIB} )
 			endif ()
-			install (FILES ${expat_ROOT}/libs/libexpat.dll DESTINATION bin COMPONENT APPLICATIONS)
+			install ( FILES ${expat_ROOT}/libs/libexpat.dll DESTINATION bin COMPONENT APPLICATIONS )
 		endif ()
 	endif ()
 
-	if (HAVE_iconv)
-		option (WITH_ICONV "compile with iconv support" ON)
-		if (WITH_ICONV)
-			set (USE_LIBICONV 1)
-			include_directories (${iconv_INCLUDE})
-			list (APPEND EXTRA_LIBRARIES ${iconv_LIB})
-			install (FILES ${iconv_ROOT}/bin/iconv.dll DESTINATION bin COMPONENT APPLICATIONS)
+	if ( HAVE_iconv )
+		option ( WITH_ICONV "compile with iconv support" ON )
+		if ( WITH_ICONV )
+			set ( USE_LIBICONV 1 )
+			include_directories ( ${iconv_INCLUDE} )
+			list ( APPEND EXTRA_LIBRARIES ${iconv_LIB} )
+			install ( FILES ${iconv_ROOT}/bin/iconv.dll DESTINATION bin COMPONENT APPLICATIONS )
 		endif ()
 	endif ()
 
-	if (HAVE_mysql)
-		option (WITH_MYSQL "compile with mysql support" ON)
-		if (WITH_MYSQL)
-			set (USE_MYSQL 1)
-			include_directories (${mysql_INCLUDE})
-
-			CMAKE_DEPENDENT_OPTION (DL_MYSQL "load mysql library dynamically" OFF "USE_MYSQL" ON)
-			if (DL_MYSQL)
-				set (DL_MYSQL 1)
-				set (MYSQL_LIB libmysql.dll)
-			else( DL_MYSQL )
-				list (APPEND EXTRA_LIBRARIES ${mysql_LIB})
+	if ( HAVE_mysql )
+		option ( WITH_MYSQL "compile with mysql support" ON )
+		if ( WITH_MYSQL )
+			set ( USE_MYSQL 1 )
+			include_directories ( ${mysql_INCLUDE} )
+
+			CMAKE_DEPENDENT_OPTION ( DL_MYSQL "load mysql library dynamically" OFF "USE_MYSQL" ON )
+			if ( DL_MYSQL )
+				set ( DL_MYSQL 1 )
+				set ( MYSQL_LIB libmysql.dll )
+			else ( DL_MYSQL )
+				list ( APPEND EXTRA_LIBRARIES ${mysql_LIB} )
 			endif ()
-			install (FILES ${mysql_ROOT}/bin/libmysql.dll DESTINATION bin COMPONENT APPLICATIONS)
+			install ( FILES ${mysql_ROOT}/bin/libmysql.dll DESTINATION bin COMPONENT APPLICATIONS )
 		endif ()
 	endif ()
 
-	if (HAVE_pq)
-		option (WITH_PGSQL "compile with pq support" OFF)
-		if (WITH_PGSQL)
-			set (USE_PGSQL 1)
-			include_directories (${pq_INCLUDE})
-
-			CMAKE_DEPENDENT_OPTION (DL_PGSQL "load pgsql library dynamically" OFF "USE_PGSQL" ON)
-			if (DL_PGSQL)
-				set (DL_PGSQL 1)
-				set (PGSQL_LIB libpq.dll)
-			else( DL_PGSQL )
-				list (APPEND EXTRA_LIBRARIES ${pq_LIB})
+	if ( HAVE_pq )
+		option ( WITH_PGSQL "compile with pq support" OFF )
+		if ( WITH_PGSQL )
+			set ( USE_PGSQL 1 )
+			include_directories ( ${pq_INCLUDE} )
+
+			CMAKE_DEPENDENT_OPTION ( DL_PGSQL "load pgsql library dynamically" OFF "USE_PGSQL" ON )
+			if ( DL_PGSQL )
+				set ( DL_PGSQL 1 )
+				set ( PGSQL_LIB libpq.dll )
+			else ( DL_PGSQL )
+				list ( APPEND EXTRA_LIBRARIES ${pq_LIB} )
 			endif ()
-			set (SPHINX_PACKAGE_SUFFIX "${SPHINX_PACKAGE_SUFFIX}-pgsql")
-			IF (CMAKE_EXE_LINKER_FLAGS MATCHES "x64")
-				install (FILES
+			set ( SPHINX_PACKAGE_SUFFIX "${SPHINX_PACKAGE_SUFFIX}-pgsql" )
+			IF ( CMAKE_EXE_LINKER_FLAGS MATCHES "x64" )
+				install ( FILES
 						${pq_ROOT}/bin/libeay32.dll
 						${pq_ROOT}/bin/libiconv-2.dll
 						${pq_ROOT}/bin/libintl-8.dll
 						${pq_ROOT}/bin/libpq.dll
 						${pq_ROOT}/bin/ssleay32.dll
-						DESTINATION bin COMPONENT APPLICATIONS)
-			else()
-				install (FILES
+						DESTINATION bin COMPONENT APPLICATIONS )
+			else ()
+				install ( FILES
 						${pq_ROOT}/bin/libeay32.dll
 						${pq_ROOT}/bin/libiconv.dll
 						${pq_ROOT}/bin/libintl.dll
 						${pq_ROOT}/bin/libpq.dll
 						${pq_ROOT}/bin/ssleay32.dll
-						DESTINATION bin COMPONENT APPLICATIONS)
+						DESTINATION bin COMPONENT APPLICATIONS )
 			endif ()
 		endif ()
 	endif ()
-	mark_as_advanced(CMAKE_CONFIGURATION_TYPES)
-else (WIN32)
-
-	include (helpers)
-
-	message (STATUS "Checking for gcc version")
-	include (check_veryold_gcc)
-	message (STATUS "Checking for endianess")
-	include (SphEndianess)
-
-	if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-		set (HAVE_GCC_LIKE ON)
-	endif()
-
-	if (HAVE_GCC_LIKE)
-		set (CFLAGS "-fno-strict-aliasing -Wall -g")
-		add_definitions ("-D_FILE_OFFSET_BITS=64")
-		if (CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
-			set (CFLAGS "${CFLAGS} -O2 -g")
-		elseif (CMAKE_BULD_TYPE MATCHES Release)
-			set (CFLAGS "-fno-strict-aliasing -Wall -O3")
-			set (SPLIT_SYMBOLS OFF)
-		elseif (NOT CMAKE_BUILD_TYPE MATCHES Debug)
-			set (CFLAGS "${CFLAGS} -O3 -g")
-		else()
-			set (CLANGFLAGS "-Wthread-safety" )
+	mark_as_advanced ( CMAKE_CONFIGURATION_TYPES )
+else ( WIN32 )
+
+	include ( helpers )
+
+	message ( STATUS "Checking for gcc version" )
+	include ( check_veryold_gcc )
+	message ( STATUS "Checking for endianess" )
+	include ( SphEndianess )
+
+	if ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
+		set ( HAVE_GCC_LIKE ON )
+	endif ()
+
+	if ( HAVE_GCC_LIKE )
+		set ( CFLAGS "-fno-strict-aliasing -Wall -g" )
+		add_definitions ( "-D_FILE_OFFSET_BITS=64" )
+		if ( CMAKE_BUILD_TYPE MATCHES RelWithDebInfo )
+			set ( CFLAGS "${CFLAGS} -O2 -g" )
+		elseif ( CMAKE_BULD_TYPE MATCHES Release )
+			set ( CFLAGS "-fno-strict-aliasing -Wall -O3" )
+			set ( SPLIT_SYMBOLS OFF )
+		elseif ( NOT CMAKE_BUILD_TYPE MATCHES Debug )
+			set ( CFLAGS "${CFLAGS} -O3 -g" )
+		else ()
+			set ( CLANGFLAGS "-Wthread-safety" )
 		endif ()
-		set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CFLAGS}")
-		set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CFLAGS} -fno-rtti -std=c++11")
+		set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CFLAGS}" )
+		set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CFLAGS} -fno-rtti -std=c++11" )
 
 		# eliminate also some too noisy warnings from CLang
-		if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-register -Wno-missing-exception-spec -Wno-implicit-exception-spec-mismatch -Wno-invalid-offsetof ${CLANGFLAGS}")
-		endif()
-	endif (HAVE_GCC_LIKE)
+		if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
+			set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-register -Wno-missing-exception-spec -Wno-implicit-exception-spec-mismatch -Wno-invalid-offsetof ${CLANGFLAGS}" )
+		endif ()
+	endif ( HAVE_GCC_LIKE )
 
-	message (STATUS "Storing compiler version")
+	message ( STATUS "Storing compiler version" )
 	if ( HAVE_GCC_LIKE )
-		execute_process (COMMAND "${CMAKE_CXX_COMPILER}" "-dumpversion" OUTPUT_VARIABLE gcc_ver)
-		remove_crlf (COMPILER ${gcc_ver})
-		message (STATUS "Compiler is ${COMPILER}")
+		execute_process ( COMMAND "${CMAKE_CXX_COMPILER}" "-dumpversion" OUTPUT_VARIABLE gcc_ver )
+		remove_crlf ( COMPILER ${gcc_ver} )
+		message ( STATUS "Compiler is ${COMPILER}" )
 	endif ()
 
-	message (STATUS "Storing system name")
-	if (UNIX AND NOT CYGWIN)
-		execute_process (COMMAND "uname" "-a" OUTPUT_VARIABLE OS_UNAME)
-		remove_crlf (OS_UNAME ${OS_UNAME})
-	endif (UNIX AND NOT CYGWIN)
+	message ( STATUS "Storing system name" )
+	if ( UNIX AND NOT CYGWIN )
+		execute_process ( COMMAND "uname" "-a" OUTPUT_VARIABLE OS_UNAME )
+		remove_crlf ( OS_UNAME ${OS_UNAME} )
+	endif ( UNIX AND NOT CYGWIN )
 
-	message (STATUS "Looking for threads library")
-	find_package (Threads REQUIRED)
-	list (APPEND EXTRA_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
-	ac_check_func_ex ( "pthread_mutex_timedlock" "" "${CMAKE_THREAD_LIBS_INIT}")
+	message ( STATUS "Looking for threads library" )
+	find_package ( Threads REQUIRED )
+	list ( APPEND EXTRA_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} )
+	ac_check_func_ex ( "pthread_mutex_timedlock" "" "${CMAKE_THREAD_LIBS_INIT}" )
 
-	message (STATUS "Checking for standard header files")
-	include (ac_header_stdc)
+	message ( STATUS "Checking for standard header files" )
+	include ( ac_header_stdc )
 
-	message (STATUS "Checking for specific headers")
-	ac_check_headers ("execinfo.h;syslog.h;sys/eventfd.h")
+	message ( STATUS "Checking for specific headers" )
+	ac_check_headers ( "execinfo.h;syslog.h;sys/eventfd.h" )
 
 	# mb use something better. The code below is copy-pasted from automake script
-	message (STATUS "Checking for library functions")
-	ac_search_libs ("socket" "setsockopt" _DUMMY EXTRA_LIBRARIES)
-	ac_search_libs ("nsl;socket;resolv" "gethostbyname" _DUMMY EXTRA_LIBRARIES)
-	ac_search_libs ("m" "logf" HAVE_LOGF EXTRA_LIBRARIES)
-	ac_search_libs ("dl;dld" "dlopen" HAVE_DL EXTRA_LIBRARIES)
-	if (HAVE_DL)
-		set (HAVE_DLOPEN 1)
-		set (HAVE_DLERROR 1)
-	endif (HAVE_DL)
-
-
-	include (CheckFunctionExists)
-	ac_check_funcs ("strnlen;pread;poll")
-	ac_check_funcs ("backtrace;backtrace_symbols")
-	ac_check_funcs ("mremap")
-	ac_check_funcs ("nanosleep")
-	ac_check_funcs ("eventfd")
-	ac_check_funcs ("kqueue")
-	check_function_exists (epoll_ctl HAVE_EPOLL)
-	ac_search_libs ("rt" "clock_gettime" HAVE_CLOCK_GETTIME EXTRA_LIBRARIES)
-
-	sphinx_check_define ("F_SETLKW" "fcntl.h")
-	message (STATUS "Checking for atomic function")
-	include (check_atomic_intrinsics)
-
-	message (STATUS "Checking for unaligned RAM access")
-	include (check_unaligned_ram_access)
-
-	message (STATUS "Configuring the options...")
-	message (STATUS "Option DISABLE_MEMROUTINES ${DISABLE_MEMROUTINES}")
-	option (DISABLE_MEMROUTINES "If the build is broken because new/delete override, this option will disable the overriding in sphinx")
-	if (DISABLE_MEMROUTINES)
-		SET (SPH_DONT_OVERRIDE_MEMROUTINES 1)
-		list (APPEND BANNER "DISABLE_MEMROUTINES=ON")
-	endif (DISABLE_MEMROUTINES)
-	mark_as_advanced( DISABLE_MEMROUTINES )
-
-	message (STATUS "Option USE_SYSLOG ${USE_SYSLOG}")
-	CMAKE_DEPENDENT_OPTION (USE_SYSLOG "compile with possibility to use syslog for logging" ON "HAVE_SYSLOG_H" OFF)
-	IF (USE_SYSLOG)
-		set (USE_SYSLOG 1)
-	else(USE_SYSLOG)
-		unset (USE_SYSLOG)
-	ENDIF (USE_SYSLOG)
-
-	message (STATUS "Option WITH_ODBC ${WITH_ODBC}")
-	unset (_DUMMY_LIB)
-	option_menu (ODBC "compile with UnixODBC support" USE_ODBC _DUMMY_LIB)
-
-	message (STATUS "ODBC found is ${ODBC_FOUND}")
-
-	CMAKE_DEPENDENT_OPTION (DL_UNIXODBC "load UnixODBC library dynamically" ON "USE_ODBC;HAVE_DL" OFF)
-	if (DL_UNIXODBC)
-		set (DL_UNIXODBC 1)
-		GET_FILENAME_COMPONENT (UNIXODBC_LIB ${_DUMMY_LIB} NAME)
-		message (STATUS "ODBC will be loaded dynamically in runtime as ${UNIXODBC_LIB}")
-		list (APPEND BANNER "DL_UNIXODBC=ON")
-	else( DL_UNIXODBC )
-		list (APPEND EXTRA_LIBRARIES ${_DUMMY_LIB})
-	endif (DL_UNIXODBC)
-
-	message (STATUS "Option WITH_ZLIB ${WITH_ZLIB}")
-	option_menu (ZLIB "compile with zlib support" USE_ZLIB EXTRA_LIBRARIES)
+	message ( STATUS "Checking for library functions" )
+	ac_search_libs ( "socket" "setsockopt" _DUMMY EXTRA_LIBRARIES )
+	ac_search_libs ( "nsl;socket;resolv" "gethostbyname" _DUMMY EXTRA_LIBRARIES )
+	ac_search_libs ( "m" "logf" HAVE_LOGF EXTRA_LIBRARIES )
+	ac_search_libs ( "dl;dld" "dlopen" HAVE_DL EXTRA_LIBRARIES )
+	if ( HAVE_DL )
+		set ( HAVE_DLOPEN 1 )
+		set ( HAVE_DLERROR 1 )
+	endif ( HAVE_DL )
+
+
+	include ( CheckFunctionExists )
+	ac_check_funcs ( "strnlen;pread;poll" )
+	ac_check_funcs ( "backtrace;backtrace_symbols" )
+	ac_check_funcs ( "mremap" )
+	ac_check_funcs ( "nanosleep" )
+	ac_check_funcs ( "eventfd" )
+	ac_check_funcs ( "kqueue" )
+	check_function_exists ( epoll_ctl HAVE_EPOLL )
+	ac_search_libs ( "rt" "clock_gettime" HAVE_CLOCK_GETTIME EXTRA_LIBRARIES )
+
+	sphinx_check_define ( "F_SETLKW" "fcntl.h" )
+	message ( STATUS "Checking for atomic function" )
+	include ( check_atomic_intrinsics )
+
+	message ( STATUS "Checking for unaligned RAM access" )
+	include ( check_unaligned_ram_access )
+
+	message ( STATUS "Configuring the options..." )
+	message ( STATUS "Option DISABLE_MEMROUTINES ${DISABLE_MEMROUTINES}" )
+	option ( DISABLE_MEMROUTINES "If the build is broken because new/delete override, this option will disable the overriding in sphinx" )
+	if ( DISABLE_MEMROUTINES )
+		SET ( SPH_DONT_OVERRIDE_MEMROUTINES 1 )
+		list ( APPEND BANNER "DISABLE_MEMROUTINES=ON" )
+	endif ( DISABLE_MEMROUTINES )
+	mark_as_advanced ( DISABLE_MEMROUTINES )
+
+	message ( STATUS "Option USE_SYSLOG ${USE_SYSLOG}" )
+	CMAKE_DEPENDENT_OPTION ( USE_SYSLOG "compile with possibility to use syslog for logging" ON "HAVE_SYSLOG_H" OFF )
+	IF ( USE_SYSLOG )
+		set ( USE_SYSLOG 1 )
+	else ( USE_SYSLOG )
+		unset ( USE_SYSLOG )
+	ENDIF ( USE_SYSLOG )
+
+	message ( STATUS "Option WITH_ODBC ${WITH_ODBC}" )
+	unset ( _DUMMY_LIB )
+	option_menu ( ODBC "compile with UnixODBC support" USE_ODBC _DUMMY_LIB )
+
+	message ( STATUS "ODBC found is ${ODBC_FOUND}" )
+
+	CMAKE_DEPENDENT_OPTION ( DL_UNIXODBC "load UnixODBC library dynamically" ON "USE_ODBC;HAVE_DL" OFF )
+	if ( DL_UNIXODBC )
+		set ( DL_UNIXODBC 1 )
+		GET_FILENAME_COMPONENT ( UNIXODBC_LIB ${_DUMMY_LIB} NAME )
+		message ( STATUS "ODBC will be loaded dynamically in runtime as ${UNIXODBC_LIB}" )
+		list ( APPEND BANNER "DL_UNIXODBC=ON" )
+	else ( DL_UNIXODBC )
+		list ( APPEND EXTRA_LIBRARIES ${_DUMMY_LIB} )
+	endif ( DL_UNIXODBC )
+
+	message ( STATUS "Option WITH_ZLIB ${WITH_ZLIB}" )
+	option_menu ( ZLIB "compile with zlib support" USE_ZLIB EXTRA_LIBRARIES )
 	mark_as_advanced ( WITH_ZLIB )
 
-	message (STATUS "Option WITH_RLP ${WITH_RLP}")
-	option (WITH_RLP "compile with RLP library support" OFF)
-	if (WITH_RLP)
-		if (EXISTS "${SPHINXSEARCH_SOURCE_DIR}/rlp/rlp/include/bt_rlp_c.h")
-			set (USE_RLP 1)
-		else()
-			message (SEND_ERROR "missing RLP sources from librlp")
-			unset (WITH_RLP CACHE)
+	message ( STATUS "Option WITH_RLP ${WITH_RLP}" )
+	option ( WITH_RLP "compile with RLP library support" OFF )
+	if ( WITH_RLP )
+		if ( EXISTS "${SPHINXSEARCH_SOURCE_DIR}/rlp/rlp/include/bt_rlp_c.h" )
+			set ( USE_RLP 1 )
+		else ()
+			message ( SEND_ERROR "missing RLP sources from librlp" )
+			unset ( WITH_RLP CACHE )
 		endif ()
-	endif (WITH_RLP)
+	endif ( WITH_RLP )
 
 	# test for EXPAT
-	message (STATUS "Option WITH_EXPAT ${WITH_EXPAT}")
-	unset (_DUMMY_LIB)
-	option_menu (EXPAT "compile with libexpat support" USE_LIBEXPAT _DUMMY_LIB)
-	CMAKE_DEPENDENT_OPTION (DL_EXPAT "load expat library dynamically" ON "USE_LIBEXPAT;HAVE_DL" OFF)
-	if (DL_EXPAT)
-		set (DL_EXPAT 1)
-		GET_FILENAME_COMPONENT (EXPAT_LIB ${_DUMMY_LIB} NAME)
-		message (STATUS "EXPAT will be loaded dynamically in runtime as ${EXPAT_LIB}")
-		list (APPEND BANNER "DL_EXPAT=ON")
-	else( DL_EXPAT )
-		list (APPEND EXTRA_LIBRARIES ${_DUMMY_LIB})
+	message ( STATUS "Option WITH_EXPAT ${WITH_EXPAT}" )
+	unset ( _DUMMY_LIB )
+	option_menu ( EXPAT "compile with libexpat support" USE_LIBEXPAT _DUMMY_LIB )
+	CMAKE_DEPENDENT_OPTION ( DL_EXPAT "load expat library dynamically" ON "USE_LIBEXPAT;HAVE_DL" OFF )
+	if ( DL_EXPAT )
+		set ( DL_EXPAT 1 )
+		GET_FILENAME_COMPONENT ( EXPAT_LIB ${_DUMMY_LIB} NAME )
+		message ( STATUS "EXPAT will be loaded dynamically in runtime as ${EXPAT_LIB}" )
+		list ( APPEND BANNER "DL_EXPAT=ON" )
+	else ( DL_EXPAT )
+		list ( APPEND EXTRA_LIBRARIES ${_DUMMY_LIB} )
 	endif ()
 
 	# test for ICONV
-	message (STATUS "Option WITH_ICONV ${WITH_ICONV}")
-	if (WITH_EXPAT)
-		option_menu (ICONV "compile with iconv support" USE_LIBICONV EXTRA_LIBRARIES)
+	message ( STATUS "Option WITH_ICONV ${WITH_ICONV}" )
+	if ( WITH_EXPAT )
+		option_menu ( ICONV "compile with iconv support" USE_LIBICONV EXTRA_LIBRARIES )
 		mark_as_advanced ( WITH_ICONV )
-	endif (WITH_EXPAT)
+	endif ( WITH_EXPAT )
 
 	# test for MYSQL
-	message (STATUS "Option WITH_MYSQL ${WITH_MYSQL}")
-	option (WITH_MYSQL "compile with MySQL support" ON)
-	set (WITH_MYSQL_INCLUDES "" CACHE PATH "path to MySQL header files")
-	set (WITH_MYSQL_LIBS "" CACHE PATH "path to MySQL library")
-	set (WITH_MYSQL_ROOT "" CACHE PATH "path to the MySQL bundle (where both header and library lives)")
+	message ( STATUS "Option WITH_MYSQL ${WITH_MYSQL}" )
+	option ( WITH_MYSQL "compile with MySQL support" ON )
+	set ( WITH_MYSQL_INCLUDES "" CACHE PATH "path to MySQL header files" )
+	set ( WITH_MYSQL_LIBS "" CACHE PATH "path to MySQL library" )
+	set ( WITH_MYSQL_ROOT "" CACHE PATH "path to the MySQL bundle (where both header and library lives)" )
 	mark_as_advanced ( WITH_MYSQL_INCLUDES )
 	mark_as_advanced ( WITH_MYSQL_LIBS )
 	mark_as_advanced ( WITH_MYSQL_ROOT )
 
-	if (WITH_MYSQL)
-		find_package (MYSQL)
+	if ( WITH_MYSQL )
+		find_package ( MYSQL )
 
-		if (MYSQL_FOUND)
-			set (USE_MYSQL 1)
-			include_directories (${MYSQL_INCLUDE_DIR})
+		if ( MYSQL_FOUND )
+			set ( USE_MYSQL 1 )
+			include_directories ( ${MYSQL_INCLUDE_DIR} )
 
 			# -DNDEBUG we set or reset on global level, so purge it from myqsl flags
-			string (REPLACE "-DNDEBUG" "" MYSQL_CXXFLAGS "${MYSQL_CXXFLAGS}")
+			string ( REPLACE "-DNDEBUG" "" MYSQL_CXXFLAGS "${MYSQL_CXXFLAGS}" )
 			# keep only defs, include paths and libs
-			string (REGEX MATCHALL "-[DLIl]([^ ]+)" MYSQL_CXXFLAGS "${MYSQL_CXXFLAGS}")
+			string ( REGEX MATCHALL "-[DLIl]([^ ]+)" MYSQL_CXXFLAGS "${MYSQL_CXXFLAGS}" )
 			# convert list after MATCHALL back to plain string
-			string (REGEX REPLACE ";" " " MYSQL_CXXFLAGS "${MYSQL_CXXFLAGS}")
-
-			if (MYSQL_CXXFLAGS)
-				set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MYSQL_CXXFLAGS}")
-			endif (MYSQL_CXXFLAGS)
-			CMAKE_DEPENDENT_OPTION (DL_MYSQL "load mysql library dynamically" ON "MYSQL_FOUND;HAVE_DL;NOT STATIC_MYSQL" OFF)
-			CMAKE_DEPENDENT_OPTION (STATIC_MYSQL "link to mysql library statically" OFF "MYSQL_FOUND;NOT DL_MYSQL" OFF)
-			if (STATIC_MYSQL)
-				message (STATUS "Mysql will be linked statically")
-				string (REGEX REPLACE "mysqlclient" "libmysqlclient.a" MYSQL_LIBRARIES "${MYSQL_LIBRARIES}")
-			endif (STATIC_MYSQL)
-			if (DL_MYSQL)
-				message (STATUS "Mysql will not be linked (will be loaded at runtime)")
-				set (DL_MYSQL 1)
-				list (APPEND BANNER "DL_MYSQL=ON")
+			string ( REGEX REPLACE ";" " " MYSQL_CXXFLAGS "${MYSQL_CXXFLAGS}" )
+
+			if ( MYSQL_CXXFLAGS )
+				set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MYSQL_CXXFLAGS}" )
+			endif ( MYSQL_CXXFLAGS )
+			CMAKE_DEPENDENT_OPTION ( DL_MYSQL "load mysql library dynamically" ON "MYSQL_FOUND;HAVE_DL;NOT STATIC_MYSQL" OFF )
+			CMAKE_DEPENDENT_OPTION ( STATIC_MYSQL "link to mysql library statically" OFF "MYSQL_FOUND;NOT DL_MYSQL" OFF )
+			if ( STATIC_MYSQL )
+				message ( STATUS "Mysql will be linked statically" )
+				string ( REGEX REPLACE "mysqlclient" "libmysqlclient.a" MYSQL_LIBRARIES "${MYSQL_LIBRARIES}" )
+			endif ( STATIC_MYSQL )
+			if ( DL_MYSQL )
+				message ( STATUS "Mysql will not be linked (will be loaded at runtime)" )
+				set ( DL_MYSQL 1 )
+				list ( APPEND BANNER "DL_MYSQL=ON" )
 			else ( DL_MYSQL )
-				list (APPEND EXTRA_LIBRARIES ${MYSQL_LIBRARIES})
+				list ( APPEND EXTRA_LIBRARIES ${MYSQL_LIBRARIES} )
 			endif ()
-			list (APPEND BANNER "MYSQL_LIB=${MYSQL_LIB}")
-			list (APPEND BANNER "MYSQL_CONFIG_EXECUTABLE=${MYSQL_CONFIG_EXECUTABLE}")
+			list ( APPEND BANNER "MYSQL_LIB=${MYSQL_LIB}" )
+			list ( APPEND BANNER "MYSQL_CONFIG_EXECUTABLE=${MYSQL_CONFIG_EXECUTABLE}" )
 			mark_as_advanced ( MYSQL_CONFIG_EXECUTABLE )
 			mark_as_advanced ( MYSQL_LIB )
-		else (MYSQL_FOUND)
-			message (SEND_ERROR
+		else ( MYSQL_FOUND )
+			message ( SEND_ERROR
 					"********************************************************************************
 					ERROR: cannot find MySQL libraries. If you want to compile with MySQL support,
 					you must either specify file locations explicitly using
@@ -320,411 +320,411 @@ else (WIN32)
 					mysql_config is listed in your PATH environment variable. Or specify the path usint
 					-D MYSQL_CONFIG_EXECUTABLE=/path/to/mysql_config. If you want to
 					disable MySQL support, use -D WITH_MYSQL=OFF option.
-					********************************************************************************")
-		endif (MYSQL_FOUND)
-	endif (WITH_MYSQL)
+					********************************************************************************" )
+		endif ( MYSQL_FOUND )
+	endif ( WITH_MYSQL )
 
 	# test for POSTGRESQL
-	message (STATUS "Option WITH_PGSQL ${WITH_PGSQL}")
-	option (WITH_PGSQL "compile with PostgreSQL support" OFF)
-	set (WITH_PGSQL_INCLUDES "" CACHE PATH "path to PostgreSQL header files")
-	set (WITH_PGSQL_LIBS "" CACHE PATH "path to PostgreSQL library")
+	message ( STATUS "Option WITH_PGSQL ${WITH_PGSQL}" )
+	option ( WITH_PGSQL "compile with PostgreSQL support" OFF )
+	set ( WITH_PGSQL_INCLUDES "" CACHE PATH "path to PostgreSQL header files" )
+	set ( WITH_PGSQL_LIBS "" CACHE PATH "path to PostgreSQL library" )
 	mark_as_advanced ( WITH_PGSQL_LIBS )
 	mark_as_advanced ( WITH_PGSQL_INCLUDES )
 
-	if (WITH_PGSQL)
-		if (WITH_PGSQL_INCLUDES)
-			set (PostgreSQL_INCLUDE_DIR ${WITH_PGSQL_INCLUDES})
-		endif (WITH_PGSQL_INCLUDES)
+	if ( WITH_PGSQL )
+		if ( WITH_PGSQL_INCLUDES )
+			set ( PostgreSQL_INCLUDE_DIR ${WITH_PGSQL_INCLUDES} )
+		endif ( WITH_PGSQL_INCLUDES )
 
-		if (WITH_PGSQL_LIBS)
-			set (PostgreSQL_LIBRARIES ${WITH_PGSQL_LIBS}/libpq.so)
-		endif (WITH_PGSQL_LIBS)
+		if ( WITH_PGSQL_LIBS )
+			set ( PostgreSQL_LIBRARIES ${WITH_PGSQL_LIBS}/libpq.so )
+		endif ( WITH_PGSQL_LIBS )
 
-		if (NOT (WITH_PGSQL_INCLUDES AND WITH_PGSQL_LIBS))
-			find_package (PostgreSQL)
+		if ( NOT ( WITH_PGSQL_INCLUDES AND WITH_PGSQL_LIBS ))
+			find_package ( PostgreSQL )
 		endif ()
 
-		if (PostgreSQL_FOUND)
-			set (USE_PGSQL 1)
-			include_directories (${PostgreSQL_INCLUDE_DIRS})
-
-			CMAKE_DEPENDENT_OPTION (DL_PGSQL "load pgsql library dynamically" ON "PostgreSQL_FOUND;HAVE_DL;NOT STATIC_PGSQL" OFF)
-			CMAKE_DEPENDENT_OPTION (STATIC_PGSQL "link to pgsql library statically" OFF "PostgreSQL_FOUND;NOT DL_PGSQL" OFF)
-			if (STATIC_PGSQL)
-				message (STATUS "PosgreSQL will be linked statically")
-				string (REGEX REPLACE "pq" "libpq.a" PostgreSQL_LIBRARIES "${PostgreSQL_LIBRARIES}")
-			endif (STATIC_PGSQL)
-
-			if (DL_PGSQL)
-				message (STATUS "PosgreSQL will not be linked (will be loaded at runtime)")
-				set (DL_PGSQL 1)
-				GET_FILENAME_COMPONENT (PGSQL_LIB ${PostgreSQL_LIBRARY} NAME)
+		if ( PostgreSQL_FOUND )
+			set ( USE_PGSQL 1 )
+			include_directories ( ${PostgreSQL_INCLUDE_DIRS} )
+
+			CMAKE_DEPENDENT_OPTION ( DL_PGSQL "load pgsql library dynamically" ON "PostgreSQL_FOUND;HAVE_DL;NOT STATIC_PGSQL" OFF )
+			CMAKE_DEPENDENT_OPTION ( STATIC_PGSQL "link to pgsql library statically" OFF "PostgreSQL_FOUND;NOT DL_PGSQL" OFF )
+			if ( STATIC_PGSQL )
+				message ( STATUS "PosgreSQL will be linked statically" )
+				string ( REGEX REPLACE "pq" "libpq.a" PostgreSQL_LIBRARIES "${PostgreSQL_LIBRARIES}" )
+			endif ( STATIC_PGSQL )
+
+			if ( DL_PGSQL )
+				message ( STATUS "PosgreSQL will not be linked (will be loaded at runtime)" )
+				set ( DL_PGSQL 1 )
+				GET_FILENAME_COMPONENT ( PGSQL_LIB ${PostgreSQL_LIBRARY} NAME )
 			else ( DL_PGSQL )
-				list (APPEND EXTRA_LIBRARIES ${PostgreSQL_LIBRARIES})
+				list ( APPEND EXTRA_LIBRARIES ${PostgreSQL_LIBRARIES} )
 			endif ()
-		else (PostgreSQL_FOUND)
-			message (SEND_ERROR
+		else ( PostgreSQL_FOUND )
+			message ( SEND_ERROR
 					"********************************************************************************
 					ERROR: cannot find PostgreSQL libraries. If you want to compile with PosgregSQL support,
 					you must either specify file locations explicitly using
 					-D WITH_PGSQL_INCLUDES=... and -D WITH_PGSQL_LIBS=... options, or make sure path to
 					pg_config is listed in your PATH environment variable. If you want to
 					disable PostgreSQL support, use -D WITH_PGSQL=OFF option.
-					********************************************************************************")
-		endif (PostgreSQL_FOUND)
-	endif (WITH_PGSQL)
+					********************************************************************************" )
+		endif ( PostgreSQL_FOUND )
+	endif ( WITH_PGSQL )
 
-endif (WIN32)
+endif ( WIN32 )
 
-if (NOT CMAKE_BUILD_TYPE MATCHES Debug)
-	add_definitions ("-DNDEBUG")
+if ( NOT CMAKE_BUILD_TYPE MATCHES Debug )
+	add_definitions ( "-DNDEBUG" )
 endif ()
 
-find_package (BISON)
-if (BISON_FOUND)
-	option (USE_BISON "Will use bison generated grammars" ON)
-endif (BISON_FOUND)
-
-find_package (FLEX)
-if (FLEX_FOUND)
-	option (USE_FLEX "Use fresh flex generated lexers" ON)
-endif (FLEX_FOUND)
-
-if (USE_BISON)
-	set (CMAKE_GENERATED_GRAMMAR ON)
-else()
-	unset(CMAKE_GENERATED_GRAMMAR)
-	include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src")
-endif()
-
-if (USE_FLEX)
-	set (CMAKE_GENERATED_LEXER ON)
+find_package ( BISON )
+if ( BISON_FOUND )
+	option ( USE_BISON "Will use bison generated grammars" ON )
+endif ( BISON_FOUND )
+
+find_package ( FLEX )
+if ( FLEX_FOUND )
+	option ( USE_FLEX "Use fresh flex generated lexers" ON )
+endif ( FLEX_FOUND )
+
+if ( USE_BISON )
+	set ( CMAKE_GENERATED_GRAMMAR ON )
 else ()
-	unset (CMAKE_GENERATED_LEXER)
-	include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/src")
+	unset ( CMAKE_GENERATED_GRAMMAR )
+	include_directories ( "${CMAKE_CURRENT_SOURCE_DIR}/src" )
 endif ()
 
-message (STATUS "Option ENABLE_ID64 ${ENABLE_ID64}")
+if ( USE_FLEX )
+	set ( CMAKE_GENERATED_LEXER ON )
+else ()
+	unset ( CMAKE_GENERATED_LEXER )
+	include_directories ( "${CMAKE_CURRENT_SOURCE_DIR}/src" )
+endif ()
+
+message ( STATUS "Option ENABLE_ID64 ${ENABLE_ID64}" )
 mark_as_advanced ( ENABLE_ID64 )
-option (ENABLE_ID64 "use 64-bit document and word IDs" ON)
-if (ENABLE_ID64)
-	SET (USE_64BIT 1)
-else()
-	list (APPEND BANNER "ENABLE_ID64=OFF")
-endif (ENABLE_ID64)
-
-message (STATUS "Option WITH_RE2 ${WITH_RE2}")
-option (WITH_RE2 "compile with re2 library support" OFF)
-set (WITH_RE2_INCLUDES "" CACHE PATH "path to re2 header files")
-set (WITH_RE2_LIBS "" CACHE PATH "path to re2 libraries")
-set (WITH_RE2_ROOT "" CACHE PATH "path to the libre2 bundle (where both header and library lives)")
+option ( ENABLE_ID64 "use 64-bit document and word IDs" ON )
+if ( ENABLE_ID64 )
+	SET ( USE_64BIT 1 )
+else ()
+	list ( APPEND BANNER "ENABLE_ID64=OFF" )
+endif ( ENABLE_ID64 )
+
+message ( STATUS "Option WITH_RE2 ${WITH_RE2}" )
+option ( WITH_RE2 "compile with re2 library support" OFF )
+set ( WITH_RE2_INCLUDES "" CACHE PATH "path to re2 header files" )
+set ( WITH_RE2_LIBS "" CACHE PATH "path to re2 libraries" )
+set ( WITH_RE2_ROOT "" CACHE PATH "path to the libre2 bundle (where both header and library lives)" )
 mark_as_advanced ( WITH_RE2_INCLUDES )
 mark_as_advanced ( WITH_RE2_LIBS )
 mark_as_advanced ( WITH_RE2_ROOT )
 
-if (WITH_RE2)
-	find_package (RE2)
-	if (RE2_FOUND)
-		set (USE_RE2 1)
-		include_directories (${RE2_INCLUDE_DIRS})
+if ( WITH_RE2 )
+	find_package ( RE2 )
+	if ( RE2_FOUND )
+		set ( USE_RE2 1 )
+		include_directories ( ${RE2_INCLUDE_DIRS} )
 		# check whether we will build RE2 from sources ourselves
-		if (RE2_PATH)
-			add_subdirectory (${RE2_PATH})
-			list (APPEND EXTRA_LIBRARIES RE2)
-		else (RE2_PATH)
-			list (APPEND EXTRA_LIBRARIES ${RE2_LIBRARIES})
-		endif (RE2_PATH)
-	else (RE2_FOUND)
-		set (RE2_BASEDIR "${SPHINXSEARCH_BINARY_DIR}/libre2")
-		mark_as_advanced (RE2_BASEDIR)
-		if (NOT EXISTS "${RE2_BASEDIR}/Makefile")
-			find_package (Git QUIET)
-			if (GIT_EXECUTABLE)
-				set (RE2_REPO "https://github.com/sphinxsearch/re2.git")
-				message (STATUS "Cloning RE2 from ${RE2_REPO}")
+		if ( RE2_PATH )
+			add_subdirectory ( ${RE2_PATH} )
+			list ( APPEND EXTRA_LIBRARIES RE2 )
+		else ( RE2_PATH )
+			list ( APPEND EXTRA_LIBRARIES ${RE2_LIBRARIES} )
+		endif ( RE2_PATH )
+	else ( RE2_FOUND )
+		set ( RE2_BASEDIR "${SPHINXSEARCH_BINARY_DIR}/libre2" )
+		mark_as_advanced ( RE2_BASEDIR )
+		if ( NOT EXISTS "${RE2_BASEDIR}/Makefile" )
+			find_package ( Git QUIET )
+			if ( GIT_EXECUTABLE )
+				set ( RE2_REPO "https://github.com/sphinxsearch/re2.git" )
+				message ( STATUS "Cloning RE2 from ${RE2_REPO}" )
 				# here we have to clone remote libre2 repo
 				# c-p from cmake external project: try to clone 3 times in case of errors.
-				set (error_code 1)
-				set (number_of_tries 0)
-				while (error_code AND number_of_tries LESS 3)
+				set ( error_code 1 )
+				set ( number_of_tries 0 )
+				while ( error_code AND number_of_tries LESS 3 )
 					execute_process (
 							COMMAND "${GIT_EXECUTABLE}" clone "${RE2_REPO}" "${RE2_BASEDIR}"
 							WORKING_DIRECTORY "${SPHINXSEARCH_BINARY_DIR}"
 							RESULT_VARIABLE error_code
 					)
-					math (EXPR number_of_tries "${number_of_tries} + 1")
+					math ( EXPR number_of_tries "${number_of_tries} + 1" )
 				endwhile ()
-				if (error_code)
-					message (FATAL_ERROR "Failed to clone repository: ${RE2_REPO}")
+				if ( error_code )
+					message ( FATAL_ERROR "Failed to clone repository: ${RE2_REPO}" )
 				endif ()
-			else() # No git executable found
+			else () # No git executable found
 				# check whether we have local copy (to not disturb network)
-				if (EXISTS "${LIBS_BUNDLE}/master.zip")
-					message (STATUS "Unpack RE2 from ${LIBS_BUNDLE}/master.zip")
+				if ( EXISTS "${LIBS_BUNDLE}/master.zip" )
+					message ( STATUS "Unpack RE2 from ${LIBS_BUNDLE}/master.zip" )
 					execute_process (
 							COMMAND "${CMAKE_COMMAND}" -E tar xfz "${LIBS_BUNDLE}/master.zip"
-							WORKING_DIRECTORY "${SPHINXSEARCH_BINARY_DIR}")
-				# download from github as zip archive
-				else()
-					set (RE2_URL "https://github.com/sphinxsearch/re2/archive/master.zip")
-					if (NOT EXISTS "${SPHINXSEARCH_BINARY_DIR}/master.zip")
-						message (STATUS "Downloading RE2")
-						file (DOWNLOAD ${RE2_URL} ${SPHINXSEARCH_BINARY_DIR}/master.zip SHOW_PROGRESS)
-					endif()
-					message (STATUS "Unpack RE2 from ${SPHINXSEARCH_BINARY_DIR}/master.zip")
+							WORKING_DIRECTORY "${SPHINXSEARCH_BINARY_DIR}" )
+					# download from github as zip archive
+				else ()
+					set ( RE2_URL "https://github.com/sphinxsearch/re2/archive/master.zip" )
+					if ( NOT EXISTS "${SPHINXSEARCH_BINARY_DIR}/master.zip" )
+						message ( STATUS "Downloading RE2" )
+						file ( DOWNLOAD ${RE2_URL} ${SPHINXSEARCH_BINARY_DIR}/master.zip SHOW_PROGRESS )
+					endif ()
+					message ( STATUS "Unpack RE2 from ${SPHINXSEARCH_BINARY_DIR}/master.zip" )
 					execute_process (
 							COMMAND "${CMAKE_COMMAND}" -E tar xfz "${SPHINXSEARCH_BINARY_DIR}/master.zip"
-							WORKING_DIRECTORY "${SPHINXSEARCH_BINARY_DIR}")
-				endif()
-				file (RENAME "${SPHINXSEARCH_BINARY_DIR}/re2-master" "${SPHINXSEARCH_BINARY_DIR}/libre2")
-			endif()
+							WORKING_DIRECTORY "${SPHINXSEARCH_BINARY_DIR}" )
+				endif ()
+				file ( RENAME "${SPHINXSEARCH_BINARY_DIR}/re2-master" "${SPHINXSEARCH_BINARY_DIR}/libre2" )
+			endif ()
 			# for master we don't need to explicitly checkout
 
 			# also backup original Makefile; it is important step!
-			configure_file ("${RE2_BASEDIR}/Makefile" "${RE2_BASEDIR}/MakefileOrig" @ONLY)
-		endif (NOT EXISTS "${RE2_BASEDIR}/Makefile")
+			configure_file ( "${RE2_BASEDIR}/Makefile" "${RE2_BASEDIR}/MakefileOrig" @ONLY )
+		endif ( NOT EXISTS "${RE2_BASEDIR}/Makefile" )
 
 		# RE2 sources cloned. Now patch them, if necessary
-		if (NOT EXISTS "${RE2_BASEDIR}/is_patched.txt")
-			set (PATCH_FILE "${CMAKE_SOURCE_DIR}/libre2/libre2.patch")
-
-			mark_as_advanced (PATCH_FILE)
-			message (STATUS "Patching RE2")
-			find_package (Git QUIET)
-			if (GIT_EXECUTABLE)
-				execute_process (COMMAND "${GIT_EXECUTABLE}" apply ${PATCH_FILE}
+		if ( NOT EXISTS "${RE2_BASEDIR}/is_patched.txt" )
+			set ( PATCH_FILE "${CMAKE_SOURCE_DIR}/libre2/libre2.patch" )
+
+			mark_as_advanced ( PATCH_FILE )
+			message ( STATUS "Patching RE2" )
+			find_package ( Git QUIET )
+			if ( GIT_EXECUTABLE )
+				execute_process ( COMMAND "${GIT_EXECUTABLE}" apply ${PATCH_FILE}
 						WORKING_DIRECTORY "${RE2_BASEDIR}"
-				)
-				file (WRITE "${RE2_BASEDIR}/is_patched.txt" "ok")
-			# no git
-			else()
-				find_program(PATCH_PROG patch)
+						)
+				file ( WRITE "${RE2_BASEDIR}/is_patched.txt" "ok" )
+				# no git
+			else ()
+				find_program ( PATCH_PROG patch )
 				if ( PATCH_PROG )
-					mark_as_advanced(PATCH_PROG)
+					mark_as_advanced ( PATCH_PROG )
 					execute_process (
 							COMMAND "${PATCH_PROG}" -p1 --binary -i "${PATCH_FILE}"
 							WORKING_DIRECTORY "${RE2_BASEDIR}"
 					)
-					file (WRITE "${RE2_BASEDIR}/is_patched.txt" "ok")
-				endif()
-			endif()
+					file ( WRITE "${RE2_BASEDIR}/is_patched.txt" "ok" )
+				endif ()
+			endif ()
+		endif ()
+		if ( NOT EXISTS "${RE2_BASEDIR}/is_patched.txt" )
+			message ( ERROR "Couldn't patch RE2 distro. No Git or Patch found" )
 		endif ()
-		if (NOT EXISTS "${RE2_BASEDIR}/is_patched.txt")
-			message (ERROR "Couldn't patch RE2 distro. No Git or Patch found")
-		endif()
 
 		# copy our CMakeLists there
-		if (NOT EXISTS "${RE2_BASEDIR}/CMakeLists.txt")
-			message(STATUS "${CMAKE_SOURCE_DIR} - source dir")
-			configure_file ("${CMAKE_SOURCE_DIR}/libre2/CMakeLists.txt" "${RE2_BASEDIR}/CMakeLists.txt" @ONLY)
+		if ( NOT EXISTS "${RE2_BASEDIR}/CMakeLists.txt" )
+			message ( STATUS "${CMAKE_SOURCE_DIR} - source dir" )
+			configure_file ( "${CMAKE_SOURCE_DIR}/libre2/CMakeLists.txt" "${RE2_BASEDIR}/CMakeLists.txt" @ONLY )
 		endif ()
-        set (USE_RE2 1)
-		set (RE2_INCLUDE_DIRS "${RE2_BASEDIR}")
-		include_directories (${RE2_BASEDIR})
-		add_subdirectory (${RE2_BASEDIR} ${RE2_BASEDIR} EXCLUDE_FROM_ALL)
-		list (APPEND EXTRA_LIBRARIES RE2)
-	endif (RE2_FOUND)
-endif (WITH_RE2)
-
-message (STATUS "Option WITH_STEMMER ${WITH_STEMMER}")
-OPTION (WITH_STEMMER "compile with stemmer support" OFF)
-IF (WITH_STEMMER)
-	find_package (stemmer)
-	if (STEMMER_FOUND)
-		SET (USE_LIBSTEMMER 1)
-		include_directories (${STEMMER_INCLUDE_DIR})
-		if (STEMMER_INTERNAL)
-			add_subdirectory (${CMAKE_SOURCE_DIR}/libstemmer_c)
-			list (APPEND EXTRA_LIBRARIES stemmer)
-		else()
-			list (APPEND EXTRA_LIBRARIES ${STEMMER_LIBRARY})
-		endif (STEMMER_INTERNAL)
-	else(STEMMER_FOUND)
-		if (EXISTS "${LIBS_BUNDLE}/libstemmer_c.tgz")
-			message (STATUS "Unpack Stemmer from ${LIBS_BUNDLE}/libstemmer_c.tgz")
+		set ( USE_RE2 1 )
+		set ( RE2_INCLUDE_DIRS "${RE2_BASEDIR}" )
+		include_directories ( ${RE2_BASEDIR} )
+		add_subdirectory ( ${RE2_BASEDIR} ${RE2_BASEDIR} EXCLUDE_FROM_ALL )
+		list ( APPEND EXTRA_LIBRARIES RE2 )
+	endif ( RE2_FOUND )
+endif ( WITH_RE2 )
+
+message ( STATUS "Option WITH_STEMMER ${WITH_STEMMER}" )
+OPTION ( WITH_STEMMER "compile with stemmer support" OFF )
+IF ( WITH_STEMMER )
+	find_package ( stemmer )
+	if ( STEMMER_FOUND )
+		SET ( USE_LIBSTEMMER 1 )
+		include_directories ( ${STEMMER_INCLUDE_DIR} )
+		if ( STEMMER_INTERNAL )
+			add_subdirectory ( ${CMAKE_SOURCE_DIR}/libstemmer_c )
+			list ( APPEND EXTRA_LIBRARIES stemmer )
+		else ()
+			list ( APPEND EXTRA_LIBRARIES ${STEMMER_LIBRARY} )
+		endif ( STEMMER_INTERNAL )
+	else ( STEMMER_FOUND )
+		if ( EXISTS "${LIBS_BUNDLE}/libstemmer_c.tgz" )
+			message ( STATUS "Unpack Stemmer from ${LIBS_BUNDLE}/libstemmer_c.tgz" )
 			execute_process (
 					COMMAND "${CMAKE_COMMAND}" -E tar xfz "${LIBS_BUNDLE}/libstemmer_c.tgz"
-					WORKING_DIRECTORY "${SPHINXSEARCH_BINARY_DIR}")
+					WORKING_DIRECTORY "${SPHINXSEARCH_BINARY_DIR}" )
 			# download from github as zip archive
-		else(EXISTS "${LIBS_BUNDLE}/libstemmer_c.tgz")
-			set (STEMMER_URL "http://snowball.tartarus.org/dist/libstemmer_c.tgz")
-			if (NOT EXISTS "${SPHINXSEARCH_BINARY_DIR}/libstemmer_c.tgz")
-				message (STATUS "Downloading Stemmer")
-				file (DOWNLOAD ${STEMMER_URL} ${SPHINXSEARCH_BINARY_DIR}/libstemmer_c.tgz SHOW_PROGRESS)
+		else ( EXISTS "${LIBS_BUNDLE}/libstemmer_c.tgz" )
+			set ( STEMMER_URL "http://snowball.tartarus.org/dist/libstemmer_c.tgz" )
+			if ( NOT EXISTS "${SPHINXSEARCH_BINARY_DIR}/libstemmer_c.tgz" )
+				message ( STATUS "Downloading Stemmer" )
+				file ( DOWNLOAD ${STEMMER_URL} ${SPHINXSEARCH_BINARY_DIR}/libstemmer_c.tgz SHOW_PROGRESS )
 			endif ()
-			message (STATUS "Unpack Stemmer from ${SPHINXSEARCH_BINARY_DIR}/libstemmer_c.tgz")
+			message ( STATUS "Unpack Stemmer from ${SPHINXSEARCH_BINARY_DIR}/libstemmer_c.tgz" )
 			execute_process (
 					COMMAND "${CMAKE_COMMAND}" -E tar xfz "${SPHINXSEARCH_BINARY_DIR}/libstemmer_c.tgz"
-					WORKING_DIRECTORY "${SPHINXSEARCH_BINARY_DIR}")
-		endif (EXISTS "${LIBS_BUNDLE}/libstemmer_c.tgz")
-		set (STEMMER_BASEDIR "${SPHINXSEARCH_BINARY_DIR}/libstemmer_c")
+					WORKING_DIRECTORY "${SPHINXSEARCH_BINARY_DIR}" )
+		endif ( EXISTS "${LIBS_BUNDLE}/libstemmer_c.tgz" )
+		set ( STEMMER_BASEDIR "${SPHINXSEARCH_BINARY_DIR}/libstemmer_c" )
 		# copy our CMakeLists there
-		if (NOT EXISTS "${STEMMER_BASEDIR}/CMakeLists.txt")
-			configure_file ("${CMAKE_SOURCE_DIR}/libstemmer_c/CMakeLists.txt" "${STEMMER_BASEDIR}/CMakeLists.txt" @ONLY)
+		if ( NOT EXISTS "${STEMMER_BASEDIR}/CMakeLists.txt" )
+			configure_file ( "${CMAKE_SOURCE_DIR}/libstemmer_c/CMakeLists.txt" "${STEMMER_BASEDIR}/CMakeLists.txt" @ONLY )
 		endif ()
-		set (USE_LIBSTEMMER 1)
-		set (STEMMER_INCLUDE_DIR "${STEMMER_BASEDIR}/include")
-		include_directories (${STEMMER_BASEDIR}/include)
-		add_subdirectory (${STEMMER_BASEDIR} ${STEMMER_BASEDIR} EXCLUDE_FROM_ALL)
-		list (APPEND EXTRA_LIBRARIES stemmer)
-		if (NOT EXISTS "${STEMMER_BASEDIR}/CMakeLists.txt")
-			message (SEND_ERROR "missing libstemmer sources from libstemmer_c.
+		set ( USE_LIBSTEMMER 1 )
+		set ( STEMMER_INCLUDE_DIR "${STEMMER_BASEDIR}/include" )
+		include_directories ( ${STEMMER_BASEDIR}/include )
+		add_subdirectory ( ${STEMMER_BASEDIR} ${STEMMER_BASEDIR} EXCLUDE_FROM_ALL )
+		list ( APPEND EXTRA_LIBRARIES stemmer )
+		if ( NOT EXISTS "${STEMMER_BASEDIR}/CMakeLists.txt" )
+			message ( SEND_ERROR "missing libstemmer sources from libstemmer_c.
 Please download the C version of libstemmer library from
 http://snowball.tartarus.org/ and extract its sources over libstemmer_c/
 subdirectory in order to build Sphinx with libstemmer support. Or
 install the package named like 'libstemmer-dev' using your favorite
-package manager.")
-			unset (WITH_STEMMER CACHE)
-		endif()
-	ENDIF (STEMMER_FOUND)
-	set (SPHINX_PACKAGE_SUFFIX "${SPHINX_PACKAGE_SUFFIX}-stemmer")
-ENDIF (WITH_STEMMER)
-
-option (SPLIT_SYMBOLS "whether to split debug symbols from binaries" ON)
-
-LIST (APPEND BANNER "SPLIT_SYMBOLS=${SPLIT_SYMBOLS}")
-LIST (APPEND BANNER "USE_BISON=${USE_BISON}")
-LIST (APPEND BANNER "USE_FLEX=${USE_FLEX}")
-LIST (APPEND BANNER "USE_SYSLOG=${USE_SYSLOG}")
-LIST (APPEND BANNER "WITH_EXPAT=${WITH_EXPAT}")
-LIST (APPEND BANNER "WITH_ICONV=${WITH_ICONV}")
-LIST (APPEND BANNER "WITH_MYSQL=${WITH_MYSQL}")
-LIST (APPEND BANNER "WITH_MYSQL_INCLUDES=${WITH_MYSQL_INCLUDES}")
-LIST (APPEND BANNER "WITH_MYSQL_LIBS=${WITH_MYSQL_LIBS}")
-LIST (APPEND BANNER "WITH_MYSQL_ROOT=${WITH_MYSQL_ROOT}")
-LIST (APPEND BANNER "WITH_ODBC=${WITH_ODBC}")
-LIST (APPEND BANNER "WITH_PGSQL=${WITH_PGSQL}")
-LIST (APPEND BANNER "WITH_PGSQL_INCLUDES=${WITH_PGSQL_INCLUDES}")
-LIST (APPEND BANNER "WITH_PGSQL_LIBS=${WITH_PGSQL_LIBS}")
-LIST (APPEND BANNER "WITH_RE2=${WITH_RE2}")
-LIST (APPEND BANNER "WITH_RE2_INCLUDES=${WITH_RE2_INCLUDES}")
-LIST (APPEND BANNER "WITH_RE2_LIBS=${WITH_RE2_LIBS}")
-LIST (APPEND BANNER "WITH_RE2_ROOT=${WITH_RE2_ROOT}")
-LIST (APPEND BANNER "WITH_RLP=${WITH_RLP}")
-LIST (APPEND BANNER "WITH_STEMMER=${WITH_STEMMER}")
-LIST (APPEND BANNER "WITH_ZLIB=${WITH_ZLIB}")
-
-set ( CONFIGURE_FLAGS "Configured with CMake with these definitions:")
-FOREACH (OPTION ${BANNER})
-	set ( CONFIGURE_FLAGS "${CONFIGURE_FLAGS} -D${OPTION}")
+package manager." )
+			unset ( WITH_STEMMER CACHE )
+		endif ()
+	ENDIF ( STEMMER_FOUND )
+	set ( SPHINX_PACKAGE_SUFFIX "${SPHINX_PACKAGE_SUFFIX}-stemmer" )
+ENDIF ( WITH_STEMMER )
+
+option ( SPLIT_SYMBOLS "whether to split debug symbols from binaries" ON )
+
+LIST ( APPEND BANNER "SPLIT_SYMBOLS=${SPLIT_SYMBOLS}" )
+LIST ( APPEND BANNER "USE_BISON=${USE_BISON}" )
+LIST ( APPEND BANNER "USE_FLEX=${USE_FLEX}" )
+LIST ( APPEND BANNER "USE_SYSLOG=${USE_SYSLOG}" )
+LIST ( APPEND BANNER "WITH_EXPAT=${WITH_EXPAT}" )
+LIST ( APPEND BANNER "WITH_ICONV=${WITH_ICONV}" )
+LIST ( APPEND BANNER "WITH_MYSQL=${WITH_MYSQL}" )
+LIST ( APPEND BANNER "WITH_MYSQL_INCLUDES=${WITH_MYSQL_INCLUDES}" )
+LIST ( APPEND BANNER "WITH_MYSQL_LIBS=${WITH_MYSQL_LIBS}" )
+LIST ( APPEND BANNER "WITH_MYSQL_ROOT=${WITH_MYSQL_ROOT}" )
+LIST ( APPEND BANNER "WITH_ODBC=${WITH_ODBC}" )
+LIST ( APPEND BANNER "WITH_PGSQL=${WITH_PGSQL}" )
+LIST ( APPEND BANNER "WITH_PGSQL_INCLUDES=${WITH_PGSQL_INCLUDES}" )
+LIST ( APPEND BANNER "WITH_PGSQL_LIBS=${WITH_PGSQL_LIBS}" )
+LIST ( APPEND BANNER "WITH_RE2=${WITH_RE2}" )
+LIST ( APPEND BANNER "WITH_RE2_INCLUDES=${WITH_RE2_INCLUDES}" )
+LIST ( APPEND BANNER "WITH_RE2_LIBS=${WITH_RE2_LIBS}" )
+LIST ( APPEND BANNER "WITH_RE2_ROOT=${WITH_RE2_ROOT}" )
+LIST ( APPEND BANNER "WITH_RLP=${WITH_RLP}" )
+LIST ( APPEND BANNER "WITH_STEMMER=${WITH_STEMMER}" )
+LIST ( APPEND BANNER "WITH_ZLIB=${WITH_ZLIB}" )
+
+set ( CONFIGURE_FLAGS "Configured with CMake with these definitions:" )
+FOREACH ( OPTION ${BANNER} )
+	set ( CONFIGURE_FLAGS "${CONFIGURE_FLAGS} -D${OPTION}" )
 endforeach ()
 
-message (STATUS "Generating config.h file")
-configure_file ("${SPHINXSEARCH_SOURCE_DIR}/config/config_cmake.h.in"
-		"${SPHINXSEARCH_BINARY_DIR}/config/config.h")
-add_definitions (-DHAVE_CONFIG_H)
-include_directories ("${SPHINXSEARCH_BINARY_DIR}/config")
+message ( STATUS "Generating config.h file" )
+configure_file ( "${SPHINXSEARCH_SOURCE_DIR}/config/config_cmake.h.in"
+		"${SPHINXSEARCH_BINARY_DIR}/config/config.h" )
+add_definitions ( -DHAVE_CONFIG_H )
+include_directories ( "${SPHINXSEARCH_BINARY_DIR}/config" )
 
 enable_testing ()
-add_subdirectory (src)
+add_subdirectory ( src )
 
-add_subdirectory (test)
+add_subdirectory ( test )
 
 # a bit of installation stuff
-install (DIRECTORY api doc contrib DESTINATION share/doc COMPONENT doc)
-install (FILES example.sql DESTINATION share/doc COMPONENT doc)
-if (WIN32)
- install (FILES COPYING INSTALL sphinx.conf.in sphinx-min.conf.in
-		DESTINATION . COMPONENT config)
- install (DIRECTORY DESTINATION log COMPONENT config)
- install (DIRECTORY DESTINATION data COMPONENT config)
-else()
- install (FILES COPYING INSTALL sphinx.conf.in sphinx-min.conf.in
-		DESTINATION share/doc COMPONENT config)
+install ( DIRECTORY api doc contrib DESTINATION share/doc COMPONENT doc )
+install ( FILES example.sql DESTINATION share/doc COMPONENT doc )
+if ( WIN32 )
+	install ( FILES COPYING INSTALL sphinx.conf.in sphinx-min.conf.in
+			DESTINATION . COMPONENT config )
+	install ( DIRECTORY DESTINATION log COMPONENT config )
+	install ( DIRECTORY DESTINATION data COMPONENT config )
+else ()
+	install ( FILES COPYING INSTALL sphinx.conf.in sphinx-min.conf.in
+			DESTINATION share/doc COMPONENT config )
 endif ()
-configure_file ("${SPHINXSEARCH_SOURCE_DIR}/COPYING"
-		"${SPHINXSEARCH_BINARY_DIR}/COPYING.txt")
+configure_file ( "${SPHINXSEARCH_SOURCE_DIR}/COPYING"
+		"${SPHINXSEARCH_BINARY_DIR}/COPYING.txt" )
 
-set (CPACK_SOURCE_IGNORE_FILES "/\\\\.idea/" "/\\\\.git/"
+set ( CPACK_SOURCE_IGNORE_FILES "/\\\\.idea/" "/\\\\.git/"
 		"/\\\\.svn/" "/autom4te\\\\.cache/" "/bin/" "/junk/" "/win/"
-		".swp$" ".orig$" ".log$" ".deps/")
-set (CPACK_SOURCE_GENERATOR TGZ)
-
-set (CPACK_COMPONENT_APPLICATIONS_GROUP "bin")
-set (CPACK_COMPONENT_GROUP_BIN_DISPLAY_NAME "Runtime")
-set (CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "Sphinx applications")
-set (CPACK_COMPONENT_CONFIG_GROUP "bin")
-set (CPACK_COMPONENT_CONFIG_DISPLAY_NAME "Configuration examples")
-set (CPACK_COMPONENT_DOC_GROUP "bin")
-set (CPACK_COMPONENT_DOC_DISPLAY_NAME "Documentation")
-set (CPACK_COMPONENT_DBGSYMBOLS_GROUP "dbg")
-set (CPACK_COMPONENT_GROUP_DBG_DISPLAY_NAME "Development")
-set (CPACK_COMPONENT_DBGSYMBOLS_DISPLAY_NAME "Debug symbols")
-set (CPACK_COMPONENT_DBGSYMBOLS_DEPENDS applications)
-set (CPACK_DEB_COMPONENT_INSTALL 1)
-set (CPACK_RPM_COMPONENT_INSTALL 1)
-set (CPACK_ARCHIVE_COMPONENT_INSTALL 1)
-set (CPACK_PACKAGE_NAME "sphinx")
-set (CPACK_PACKAGE_VENDOR "Sphinx Technologies Inc.")
-set (CPACK_RESOURCE_FILE_LICENSE "${SPHINXSEARCH_BINARY_DIR}/COPYING.txt")
+		".swp$" ".orig$" ".log$" ".deps/" )
+set ( CPACK_SOURCE_GENERATOR TGZ )
+
+set ( CPACK_COMPONENT_APPLICATIONS_GROUP "bin" )
+set ( CPACK_COMPONENT_GROUP_BIN_DISPLAY_NAME "Runtime" )
+set ( CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "Sphinx applications" )
+set ( CPACK_COMPONENT_CONFIG_GROUP "bin" )
+set ( CPACK_COMPONENT_CONFIG_DISPLAY_NAME "Configuration examples" )
+set ( CPACK_COMPONENT_DOC_GROUP "bin" )
+set ( CPACK_COMPONENT_DOC_DISPLAY_NAME "Documentation" )
+set ( CPACK_COMPONENT_DBGSYMBOLS_GROUP "dbg" )
+set ( CPACK_COMPONENT_GROUP_DBG_DISPLAY_NAME "Development" )
+set ( CPACK_COMPONENT_DBGSYMBOLS_DISPLAY_NAME "Debug symbols" )
+set ( CPACK_COMPONENT_DBGSYMBOLS_DEPENDS applications )
+set ( CPACK_DEB_COMPONENT_INSTALL 1 )
+set ( CPACK_RPM_COMPONENT_INSTALL 1 )
+set ( CPACK_ARCHIVE_COMPONENT_INSTALL 1 )
+set ( CPACK_PACKAGE_NAME "sphinx" )
+set ( CPACK_PACKAGE_VENDOR "Sphinx Technologies Inc." )
+set ( CPACK_RESOURCE_FILE_LICENSE "${SPHINXSEARCH_BINARY_DIR}/COPYING.txt" )
 
 # fallback falues
-SET (CPACK_PACKAGE_VERSION_MAJOR 0)
-SET (CPACK_PACKAGE_VERSION_MINOR 0)
-SET (CPACK_PACKAGE_VERSION_PATCH 0)
+SET ( CPACK_PACKAGE_VERSION_MAJOR 0 )
+SET ( CPACK_PACKAGE_VERSION_MINOR 0 )
+SET ( CPACK_PACKAGE_VERSION_PATCH 0 )
 
 # real string
-FILE (STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/src/sphinx.h" _SPHINXH
+FILE ( STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/src/sphinx.h" _SPHINXH
 		LIMIT_COUNT 500
-		REGEX "^#define SPHINX_(TAG|VERSION_NUMBERS).*")
-FOREACH (LINE ${_SPHINXH})
-	IF ("${LINE}" MATCHES "SPHINX_TAG")
-		STRING (REGEX REPLACE "#define[ \t]+SPHINX_TAG[ \t]+\"-?(.*)\"$" "\\1" _TAG "${LINE}")
-		set (SPHINX_TAG "${_TAG}")
-		LIST (APPEND BANNER "SPHINX_TAG=${SPHINX_TAG}")
-	ELSEIF ("${LINE}" MATCHES "SPHINX_VERSION_NUMBERS")
-		STRING (REGEX REPLACE ".*\"(.*)\"(.*)$" "\\1" _VER "${LINE}")
-		STRING (REGEX REPLACE "\\." ";" _VER "${_VER}")
-		LIST (APPEND _VER "0;0;0")
-		LIST (GET _VER 0 CPACK_PACKAGE_VERSION_MAJOR)
-		LIST (GET _VER 1 CPACK_PACKAGE_VERSION_MINOR)
-		LIST (GET _VER 2 CPACK_PACKAGE_VERSION_PATCH)
+		REGEX "^#define SPHINX_(TAG|VERSION_NUMBERS).*" )
+FOREACH ( LINE ${_SPHINXH} )
+	IF ( "${LINE}" MATCHES "SPHINX_TAG" )
+		STRING ( REGEX REPLACE "#define[ \t]+SPHINX_TAG[ \t]+\"-?(.*)\"$" "\\1" _TAG "${LINE}" )
+		set ( SPHINX_TAG "${_TAG}" )
+		LIST ( APPEND BANNER "SPHINX_TAG=${SPHINX_TAG}" )
+	ELSEIF ( "${LINE}" MATCHES "SPHINX_VERSION_NUMBERS" )
+		STRING ( REGEX REPLACE ".*\"(.*)\"(.*)$" "\\1" _VER "${LINE}" )
+		STRING ( REGEX REPLACE "\\." ";" _VER "${_VER}" )
+		LIST ( APPEND _VER "0;0;0" )
+		LIST ( GET _VER 0 CPACK_PACKAGE_VERSION_MAJOR )
+		LIST ( GET _VER 1 CPACK_PACKAGE_VERSION_MINOR )
+		LIST ( GET _VER 2 CPACK_PACKAGE_VERSION_PATCH )
 	ENDIF ()
 endforeach ()
 
-IF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-	SET (CPACK_DEBIAN_PACKAGE_ARCHITECTURE amd64)
-	SET (CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64")
-ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686")
-	SET (CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386)
-	SET (CPACK_RPM_PACKAGE_ARCHITECTURE "i386")
-ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-
-set (CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set (CPACK_PACKAGE_CONTACT "Sphinx package builds <[email protected]>")
-SET (CPACK_RPM_PACKAGE_LICENSE "GNU General Public License v. 2 (GPL2)")
-
-set (FULL_VERSION "${CPACK_PACKAGE_VERSION}")
-
-if (WIN32)
-	set (SUGGEST_GENERATOR "ZIP")
-	set (SPHINX_ARCH "win32")
-	IF (CMAKE_EXE_LINKER_FLAGS MATCHES "x64")
-		set (SPHINX_ARCH "x64")
+IF ( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" )
+	SET ( CPACK_DEBIAN_PACKAGE_ARCHITECTURE amd64 )
+	SET ( CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64" )
+ELSEIF ( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686" )
+	SET ( CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386 )
+	SET ( CPACK_RPM_PACKAGE_ARCHITECTURE "i386" )
+ENDIF ( ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" )
+
+set ( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}" )
+set ( CPACK_PACKAGE_CONTACT "Sphinx package builds <[email protected]>" )
+SET ( CPACK_RPM_PACKAGE_LICENSE "GNU General Public License v. 2 (GPL2)" )
+
+set ( FULL_VERSION "${CPACK_PACKAGE_VERSION}" )
+
+if ( WIN32 )
+	set ( SUGGEST_GENERATOR "ZIP" )
+	set ( SPHINX_ARCH "win32" )
+	IF ( CMAKE_EXE_LINKER_FLAGS MATCHES "x64" )
+		set ( SPHINX_ARCH "x64" )
 	endif ()
-elseif(APPLE)
-	set (SUGGEST_GENERATOR "TGZ")
-else()
-	set (SUGGEST_GENERATOR "DEB")
+elseif ( APPLE )
+	set ( SUGGEST_GENERATOR "TGZ" )
+else ()
+	set ( SUGGEST_GENERATOR "DEB" )
 endif ()
 
-if (NOT CPACK_GENERATOR)
-	set (CPACK_GENERATOR "${SUGGEST_GENERATOR}")
+if ( NOT CPACK_GENERATOR )
+	set ( CPACK_GENERATOR "${SUGGEST_GENERATOR}" )
 endif ()
 
-if (SPHINX_TAG)
-	set (FULL_VERSION "${FULL_VERSION}-${SPHINX_TAG}")
+if ( SPHINX_TAG )
+	set ( FULL_VERSION "${FULL_VERSION}-${SPHINX_TAG}" )
 endif ()
 
-if (SPHINX_PACKAGE_SUFFIX)
-	set (FULL_VERSION "${FULL_VERSION}${SPHINX_PACKAGE_SUFFIX}")
+if ( SPHINX_PACKAGE_SUFFIX )
+	set ( FULL_VERSION "${FULL_VERSION}${SPHINX_PACKAGE_SUFFIX}" )
 endif ()
 
-if (SPHINX_ARCH)
-	set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${FULL_VERSION}-${SPHINX_ARCH}")
-else()
-	set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${FULL_VERSION}")
-endif()
+if ( SPHINX_ARCH )
+	set ( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${FULL_VERSION}-${SPHINX_ARCH}" )
+else ()
+	set ( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${FULL_VERSION}" )
+endif ()
 
-include (CPack)
+include ( CPack )

cmake/FindICONV.cmake

@@ -27,11 +27,11 @@
 
 find_path ( ICONV_INCLUDE_DIRS iconv.h )
 
-include(helpers)
-ac_search_libs ("iconv;libiconv" "iconv" HAVE_LIBICONV LIBICONV_LIBRARY)
+include ( helpers )
+ac_search_libs ( "iconv;libiconv" "iconv" HAVE_LIBICONV LIBICONV_LIBRARY )
 
-if (HAVE_LIBICONV)
-	set (_CHECK_ICONV "#include <iconv.h>
+if ( HAVE_LIBICONV )
+	set ( _CHECK_ICONV "#include <iconv.h>
 #include <stdio.h>
 
 int main()
@@ -40,31 +40,31 @@ const char * inbuf;
 iconv_t cd;
 iconv ( cd, &inbuf, NULL, NULL, NULL );
 return 0;
-}")
+}" )
 
-	include(CheckCXXSourceCompiles)
-	set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIRS})
-	set(CMAKE_REQUIRED_LIBRARIES ${LIBICONV_LIBRARY})
-	CHECK_CXX_SOURCE_COMPILES("${_CHECK_ICONV}" HAVE_CONST_ICONV)
-	set(CMAKE_REQUIRED_INCLUDES)
-	set(CMAKE_REQUIRED_LIBRARIES)
-	if (HAVE_CONST_ICONV)
-		set (ICONV_INBUF_CONST 1)
-	endif (HAVE_CONST_ICONV)
-endif (HAVE_LIBICONV)
+	include ( CheckCXXSourceCompiles )
+	set ( CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIRS} )
+	set ( CMAKE_REQUIRED_LIBRARIES ${LIBICONV_LIBRARY} )
+	CHECK_CXX_SOURCE_COMPILES ( "${_CHECK_ICONV}" HAVE_CONST_ICONV )
+	set ( CMAKE_REQUIRED_INCLUDES )
+	set ( CMAKE_REQUIRED_LIBRARIES )
+	if ( HAVE_CONST_ICONV )
+		set ( ICONV_INBUF_CONST 1 )
+	endif ( HAVE_CONST_ICONV )
+endif ( HAVE_LIBICONV )
 
-mark_as_advanced(ICONV_INCLUDE_DIRS LIBICONV_LIBRARY HAVE_CONST_ICONV)
+mark_as_advanced ( ICONV_INCLUDE_DIRS LIBICONV_LIBRARY HAVE_CONST_ICONV )
 
 # Handle the QUIETLY and REQUIRED arguments and set LIBICONV_FOUND
 # to TRUE if all listed variables are TRUE.
 # (Use ${CMAKE_ROOT}/Modules instead of ${CMAKE_CURRENT_LIST_DIR} because CMake
 #  itself includes this FindLibArchive when built with an older CMake that does
 #  not provide it.  The older CMake also does not have CMAKE_CURRENT_LIST_DIR.)
-include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
-find_package_handle_standard_args(Iconv
-								REQUIRED_VARS HAVE_LIBICONV ICONV_INCLUDE_DIRS
-	)
+include ( ${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake )
+find_package_handle_standard_args ( Iconv
+		REQUIRED_VARS HAVE_LIBICONV ICONV_INCLUDE_DIRS
+		)
 
-if(ICONV_FOUND)
-	set(ICONV_LIBRARIES ${LIBICONV_LIBRARY})
-endif()
+if ( ICONV_FOUND )
+	set ( ICONV_LIBRARIES ${LIBICONV_LIBRARY} )
+endif ()

cmake/FindMYSQL.cmake

@@ -46,28 +46,28 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 ##########################################################################
-MACRO(_MYSQL_CONFIG VAR _regex _opt)
-	EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} ${_opt}
+MACRO( _MYSQL_CONFIG VAR _regex _opt )
+	EXECUTE_PROCESS ( COMMAND ${MYSQL_CONFIG_EXECUTABLE} ${_opt}
 			OUTPUT_VARIABLE _mysql_config_output
 			)
-	SET(_var ${_mysql_config_output})
-	STRING(REGEX MATCHALL "${_regex}([^ ]+)" _mysql_config_output "${_mysql_config_output}")
-	STRING(REGEX REPLACE "^[ \t]+" "" _mysql_config_output "${_mysql_config_output}")
-	STRING(REGEX REPLACE "[\r\n]$" "" _mysql_config_output "${_mysql_config_output}")
-	STRING(REGEX REPLACE "${_regex}" "" _mysql_config_output "${_mysql_config_output}")
-	SEPARATE_ARGUMENTS(_mysql_config_output)
-	SET(${VAR} ${_mysql_config_output})
-ENDMACRO(_MYSQL_CONFIG _regex _opt)
+	SET ( _var ${_mysql_config_output} )
+	STRING ( REGEX MATCHALL "${_regex}([^ ]+)" _mysql_config_output "${_mysql_config_output}" )
+	STRING ( REGEX REPLACE "^[ \t]+" "" _mysql_config_output "${_mysql_config_output}" )
+	STRING ( REGEX REPLACE "[\r\n]$" "" _mysql_config_output "${_mysql_config_output}" )
+	STRING ( REGEX REPLACE "${_regex}" "" _mysql_config_output "${_mysql_config_output}" )
+	SEPARATE_ARGUMENTS ( _mysql_config_output )
+	SET ( ${VAR} ${_mysql_config_output} )
+ENDMACRO( _MYSQL_CONFIG _regex _opt )
 
 
-IF (NOT MYSQL_CONFIG_EXECUTABLE)
-	IF (EXISTS "$ENV{MYSQL_DIR}/bin/mysql_config")
-		SET(MYSQL_CONFIG_EXECUTABLE "$ENV{MYSQL_DIR}/bin/mysql_config")
-	ELSE (EXISTS "$ENV{MYSQL_DIR}/bin/mysql_config")
-		FIND_PROGRAM(MYSQL_CONFIG_EXECUTABLE
-			NAMES mysql_config
-			DOC "full path of mysql_config"
-			PATHS	/usr/bin
+IF ( NOT MYSQL_CONFIG_EXECUTABLE )
+	IF ( EXISTS "$ENV{MYSQL_DIR}/bin/mysql_config" )
+		SET ( MYSQL_CONFIG_EXECUTABLE "$ENV{MYSQL_DIR}/bin/mysql_config" )
+	ELSE ( EXISTS "$ENV{MYSQL_DIR}/bin/mysql_config" )
+		FIND_PROGRAM ( MYSQL_CONFIG_EXECUTABLE
+				NAMES mysql_config
+				DOC "full path of mysql_config"
+				PATHS /usr/bin
 				/usr/local/bin
 				/opt/local/lib/mysql55/bin
 				/opt/mysql/bin
@@ -75,24 +75,24 @@ IF (NOT MYSQL_CONFIG_EXECUTABLE)
 				/usr/local/mysql/bin
 				/usr/pkg/bin
 				${WITH_MYSQL_ROOT}/bin
-		)
-	ENDIF (EXISTS "$ENV{MYSQL_DIR}/bin/mysql_config")
-ENDIF (NOT MYSQL_CONFIG_EXECUTABLE)
+				)
+	ENDIF ( EXISTS "$ENV{MYSQL_DIR}/bin/mysql_config" )
+ENDIF ( NOT MYSQL_CONFIG_EXECUTABLE )
 
 #-------------- FIND MYSQL_INCLUDE_DIR ------------------
-SET(MYSQL_CXXFLAGS "")
-IF(MYSQL_CONFIG_EXECUTABLE)
-	_MYSQL_CONFIG(MYSQL_INCLUDE_DIR "(^| )-I" "--include")
-	MESSAGE(STATUS "mysql_config was found ${MYSQL_CONFIG_EXECUTABLE}")
-	EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags"
-					OUTPUT_VARIABLE _mysql_config_output
-					)
-	STRING(REGEX MATCHALL "-m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}")
-	STRING(REGEX REPLACE "[\r\n]$" "" MYSQL_CXXFLAGS "${_mysql_config_output}")
-#	ADD_DEFINITIONS("${MYSQL_CXXFLAGS}")
-ELSE (MYSQL_CONFIG_EXECUTABLE)
-	MESSAGE(STATUS "ENV{MYSQL_DIR} = $ENV{MYSQL_DIR}")
-	FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
+SET ( MYSQL_CXXFLAGS "" )
+IF ( MYSQL_CONFIG_EXECUTABLE )
+	_MYSQL_CONFIG ( MYSQL_INCLUDE_DIR "(^| )-I" "--include" )
+	MESSAGE ( STATUS "mysql_config was found ${MYSQL_CONFIG_EXECUTABLE}" )
+	EXECUTE_PROCESS ( COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags"
+			OUTPUT_VARIABLE _mysql_config_output
+			)
+	STRING ( REGEX MATCHALL "-m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}" )
+	STRING ( REGEX REPLACE "[\r\n]$" "" MYSQL_CXXFLAGS "${_mysql_config_output}" )
+	#	ADD_DEFINITIONS("${MYSQL_CXXFLAGS}")
+ELSE ( MYSQL_CONFIG_EXECUTABLE )
+	MESSAGE ( STATUS "ENV{MYSQL_DIR} = $ENV{MYSQL_DIR}" )
+	FIND_PATH ( MYSQL_INCLUDE_DIR mysql.h
 			${WITH_MYSQL_INCLUDES}
 			${WITH_MYSQL_ROOT}/include
 			${WITH_MYSQL_ROOT}/include/mysql
@@ -105,51 +105,51 @@ ELSE (MYSQL_CONFIG_EXECUTABLE)
 			/usr/local/mysql/include
 			/usr/local/mysql/include/mysql
 			$ENV{ProgramFiles}/MySQL/*/include
-			$ENV{SystemDrive}/MySQL/*/include)
-ENDIF (MYSQL_CONFIG_EXECUTABLE)
+			$ENV{SystemDrive}/MySQL/*/include )
+ENDIF ( MYSQL_CONFIG_EXECUTABLE )
 
 #----------------- FIND MYSQL_LIB_DIR -------------------
-IF (MYSQL_CONFIG_EXECUTABLE)
-	_MYSQL_CONFIG(MYSQL_LIBRARIES    "(^| )-l" "--libs")
-	_MYSQL_CONFIG(MYSQL_LIB_DIR "(^| )-L" "--libs")
-	FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient HINTS ${MYSQL_LIB_DIR})
-	GET_FILENAME_COMPONENT (MYSQL_LIB ${MYSQL_LIB} NAME)
+IF ( MYSQL_CONFIG_EXECUTABLE )
+	_MYSQL_CONFIG ( MYSQL_LIBRARIES "(^| )-l" "--libs" )
+	_MYSQL_CONFIG ( MYSQL_LIB_DIR "(^| )-L" "--libs" )
+	FIND_LIBRARY ( MYSQL_LIB NAMES mysqlclient HINTS ${MYSQL_LIB_DIR} )
+	GET_FILENAME_COMPONENT ( MYSQL_LIB ${MYSQL_LIB} NAME )
 
-ELSE (MYSQL_CONFIG_EXECUTABLE)
-	FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient
-				${WITH_MYSQL_LIBS}
-				${WITH_MYSQL_ROOT}/lib
-				${WITH_MYSQL_ROOT}/lib/mysql
-				PATHS
-				$ENV{MYSQL_DIR}/libmysql_r/.libs
-				$ENV{MYSQL_DIR}/lib
-				$ENV{MYSQL_DIR}/lib/mysql
-				/usr/lib/mysql
-				/usr/local/lib/mysql
-				/usr/local/mysql/lib
-				/usr/local/mysql/lib/mysql
-				/opt/mysql/mysql/lib
-				/opt/mysql/mysql/lib/mysql)
-	SET(MYSQL_LIBRARIES mysqlclient )
-	IF(MYSQL_LIB)
-		GET_FILENAME_COMPONENT(MYSQL_LIB_DIR ${MYSQL_LIB} PATH)
-		SET(MYSQL_LIBRARIES MYSQL_LIB)
-		GET_FILENAME_COMPONENT(MYSQL_LIB ${MYSQL_LIB} NAME)
-	ENDIF(MYSQL_LIB)
-ENDIF (MYSQL_CONFIG_EXECUTABLE)
+ELSE ( MYSQL_CONFIG_EXECUTABLE )
+	FIND_LIBRARY ( MYSQL_LIB NAMES mysqlclient
+			${WITH_MYSQL_LIBS}
+			${WITH_MYSQL_ROOT}/lib
+			${WITH_MYSQL_ROOT}/lib/mysql
+			PATHS
+			$ENV{MYSQL_DIR}/libmysql_r/.libs
+			$ENV{MYSQL_DIR}/lib
+			$ENV{MYSQL_DIR}/lib/mysql
+			/usr/lib/mysql
+			/usr/local/lib/mysql
+			/usr/local/mysql/lib
+			/usr/local/mysql/lib/mysql
+			/opt/mysql/mysql/lib
+			/opt/mysql/mysql/lib/mysql )
+	SET ( MYSQL_LIBRARIES mysqlclient )
+	IF ( MYSQL_LIB )
+		GET_FILENAME_COMPONENT ( MYSQL_LIB_DIR ${MYSQL_LIB} PATH )
+		SET ( MYSQL_LIBRARIES MYSQL_LIB )
+		GET_FILENAME_COMPONENT ( MYSQL_LIB ${MYSQL_LIB} NAME )
+	ENDIF ( MYSQL_LIB )
+ENDIF ( MYSQL_CONFIG_EXECUTABLE )
 
-SET(VERBOSE 1)
-IF (MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR)
+SET ( VERBOSE 1 )
+IF ( MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR )
 
-	MESSAGE(STATUS "MySQL Include dir: ${MYSQL_INCLUDE_DIR}")
-	MESSAGE(STATUS "MySQL Library    : ${MYSQL_LIBRARIES}")
-	MESSAGE(STATUS "MySQL Library dir: ${MYSQL_LIB_DIR}")
-	MESSAGE(STATUS "MySQL CXXFLAGS: ${MYSQL_CXXFLAGS}")
-	MESSAGE(STATUS "MySQL Link flags: ${MYSQL_LINK_FLAGS}")
-	MESSAGE(STATUS "MySQL Library Name   : ${MYSQL_LIB}")
+	MESSAGE ( STATUS "MySQL Include dir: ${MYSQL_INCLUDE_DIR}" )
+	MESSAGE ( STATUS "MySQL Library    : ${MYSQL_LIBRARIES}" )
+	MESSAGE ( STATUS "MySQL Library dir: ${MYSQL_LIB_DIR}" )
+	MESSAGE ( STATUS "MySQL CXXFLAGS: ${MYSQL_CXXFLAGS}" )
+	MESSAGE ( STATUS "MySQL Link flags: ${MYSQL_LINK_FLAGS}" )
+	MESSAGE ( STATUS "MySQL Library Name   : ${MYSQL_LIB}" )
 
-	SET(MYSQL_FOUND TRUE)
-ELSE (MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR)
-	MESSAGE(SEND_ERROR "mysql_config wasn't found, -DMYSQL_CONFIG_EXECUTABLE=...")
-	MESSAGE(FATAL_ERROR "Cannot find MySQL. Include dir: ${MYSQL_INCLUDE_DIR}  library dir: ${MYSQL_LIB_DIR} cxxflags: ${MYSQL_CXXFLAGS}")
-ENDIF (MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR)
+	SET ( MYSQL_FOUND TRUE )
+ELSE ( MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR )
+	MESSAGE ( SEND_ERROR "mysql_config wasn't found, -DMYSQL_CONFIG_EXECUTABLE=..." )
+	MESSAGE ( FATAL_ERROR "Cannot find MySQL. Include dir: ${MYSQL_INCLUDE_DIR}  library dir: ${MYSQL_LIB_DIR} cxxflags: ${MYSQL_CXXFLAGS}" )
+ENDIF ( MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR )

cmake/FindODBC.cmake

@@ -26,20 +26,20 @@
 #  License text for the above reference.)
 
 find_path ( ODBC_INCLUDE_DIRS sql.h )
-find_library ( ODBC_LIBRARY NAMES odbc iodbc unixodbc)
-mark_as_advanced(ODBC_INCLUDE_DIRS ODBC_LIBRARY)
+find_library ( ODBC_LIBRARY NAMES odbc iodbc unixodbc )
+mark_as_advanced ( ODBC_INCLUDE_DIRS ODBC_LIBRARY )
 
-message (STATUS "ODBC_INCLUDE_DIRS is ${ODBC_INCLUDE_DIRS}")
-message (STATUS "ODBC_LIBRARY is ${ODBC_LIBRARY}")
+message ( STATUS "ODBC_INCLUDE_DIRS is ${ODBC_INCLUDE_DIRS}" )
+message ( STATUS "ODBC_LIBRARY is ${ODBC_LIBRARY}" )
 
 # Handle the QUIETLY and REQUIRED arguments and set LIBICONV_FOUND
 # to TRUE if all listed variables are TRUE.
 # (Use ${CMAKE_ROOT}/Modules instead of ${CMAKE_CURRENT_LIST_DIR} because CMake
 #  itself includes this FindLibArchive when built with an older CMake that does
 #  not provide it.  The older CMake also does not have CMAKE_CURRENT_LIST_DIR.)
-include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
-find_package_handle_standard_args(ODBC 	REQUIRED_VARS ODBC_INCLUDE_DIRS ODBC_LIBRARY)
+include ( ${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake )
+find_package_handle_standard_args ( ODBC REQUIRED_VARS ODBC_INCLUDE_DIRS ODBC_LIBRARY )
 
-if(ODBC_FOUND)
-	set(ODBC_LIBRARIES    ${ODBC_LIBRARY})
-endif()
+if ( ODBC_FOUND )
+	set ( ODBC_LIBRARIES ${ODBC_LIBRARY} )
+endif ()

cmake/FindRE2.cmake

@@ -38,54 +38,54 @@
 
 # First check if include path was explicitly given.
 # If so, it has the maximum priority over any other possibilities
-if (EXISTS "${WITH_RE2_ROOT}/re2/re2.h")
-	set (RE2_INCLUDE_DIRS ${WITH_RE2_ROOT})
-	set (RE2_LIBRARY ${WITH_RE2_ROOT}/obj/libre2.a)
-	if (EXISTS "${RE2_INCLUDE_DIRS}/Makefile")
-		set (RE2_PATH ${RE2_INCLUDE_DIRS})
-	endif (EXISTS "${RE2_INCLUDE_DIRS}/Makefile")
-else (EXISTS "${WITH_RE2_ROOT}/re2/re2.h")
+if ( EXISTS "${WITH_RE2_ROOT}/re2/re2.h" )
+	set ( RE2_INCLUDE_DIRS ${WITH_RE2_ROOT} )
+	set ( RE2_LIBRARY ${WITH_RE2_ROOT}/obj/libre2.a )
+	if ( EXISTS "${RE2_INCLUDE_DIRS}/Makefile" )
+		set ( RE2_PATH ${RE2_INCLUDE_DIRS} )
+	endif ( EXISTS "${RE2_INCLUDE_DIRS}/Makefile" )
+else ( EXISTS "${WITH_RE2_ROOT}/re2/re2.h" )
 
-# Check if there are any sources in ./libre2 path
+	# Check if there are any sources in ./libre2 path
 
 
-	if (EXISTS ${CMAKE_SOURCE_DIR}/libre2/re2/re2.h)
-		set(RE2_LIBRARY "${CMAKE_SOURCE_DIR}/libre2/obj/libre2.a")
-		set(RE2_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/libre2")
-		set(RE2_PATH "${CMAKE_SOURCE_DIR}/libre2")
-	else (EXISTS ${CMAKE_SOURCE_DIR}/libre2/re2/re2.h)
+	if ( EXISTS ${CMAKE_SOURCE_DIR}/libre2/re2/re2.h )
+		set ( RE2_LIBRARY "${CMAKE_SOURCE_DIR}/libre2/obj/libre2.a" )
+		set ( RE2_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/libre2" )
+		set ( RE2_PATH "${CMAKE_SOURCE_DIR}/libre2" )
+	else ( EXISTS ${CMAKE_SOURCE_DIR}/libre2/re2/re2.h )
 
-		if (EXISTS ${WITH_RE2_INCLUDES})
-			set (RE2_INCLUDE_DIRS "${WITH_RE2_INCLUDES}")
-		else (EXISTS ${WITH_RE2_INCLUDES})
-			find_path(RE2_INCLUDE_DIRS NAMES re2/re2.h PATHS /usr/include /usr/include/re2)
-		endif (EXISTS ${WITH_RE2_INCLUDES})
+		if ( EXISTS ${WITH_RE2_INCLUDES} )
+			set ( RE2_INCLUDE_DIRS "${WITH_RE2_INCLUDES}" )
+		else ( EXISTS ${WITH_RE2_INCLUDES} )
+			find_path ( RE2_INCLUDE_DIRS NAMES re2/re2.h PATHS /usr/include /usr/include/re2 )
+		endif ( EXISTS ${WITH_RE2_INCLUDES} )
 
 		if ( EXISTS ${WITH_RE2_LIBS} )
-			set (RE2_LIBRARY ${WITH_RE2_LIBS})
+			set ( RE2_LIBRARY ${WITH_RE2_LIBS} )
 		else ( EXISTS ${WITH_RE2_LIBS} )
-			find_file(RE2_LIBRARY libre2.a
-				/usr/lib/x86_64-linux-gnu
-				/usr/lib64
-				/usr/local/lib64
-				/usr/lib/i386-linux-gnu
-				/usr/lib
-				/usr/local/lib
-			)
+			find_file ( RE2_LIBRARY libre2.a
+					/usr/lib/x86_64-linux-gnu
+					/usr/lib64
+					/usr/local/lib64
+					/usr/lib/i386-linux-gnu
+					/usr/lib
+					/usr/local/lib
+					)
 		endif ( EXISTS ${WITH_RE2_LIBS} )
-	endif (EXISTS ${CMAKE_SOURCE_DIR}/libre2/re2/re2.h)
-endif (EXISTS "${WITH_RE2_ROOT}/re2/re2.h")
+	endif ( EXISTS ${CMAKE_SOURCE_DIR}/libre2/re2/re2.h )
+endif ( EXISTS "${WITH_RE2_ROOT}/re2/re2.h" )
 
-mark_as_advanced(RE2_INCLUDE_DIRS RE2_LIBRARY)
+mark_as_advanced ( RE2_INCLUDE_DIRS RE2_LIBRARY )
 
 # Handle the QUIETLY and REQUIRED arguments and set LIBICONV_FOUND
 # to TRUE if all listed variables are TRUE.
 # (Use ${CMAKE_ROOT}/Modules instead of ${CMAKE_CURRENT_LIST_DIR} because CMake
 #  itself includes this FindLibArchive when built with an older CMake that does
 #  not provide it.  The older CMake also does not have CMAKE_CURRENT_LIST_DIR.)
-include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
-find_package_handle_standard_args(RE2 REQUIRED_VARS RE2_INCLUDE_DIRS RE2_LIBRARY)
+include ( ${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake )
+find_package_handle_standard_args ( RE2 REQUIRED_VARS RE2_INCLUDE_DIRS RE2_LIBRARY )
 
-if(RE2_FOUND)
-	set(RE2_LIBRARIES    ${RE2_LIBRARY})
-endif()
+if ( RE2_FOUND )
+	set ( RE2_LIBRARIES ${RE2_LIBRARY} )
+endif ()

cmake/Findstemmer.cmake

@@ -18,27 +18,27 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-if (EXISTS ${CMAKE_SOURCE_DIR}/libstemmer_c/include/libstemmer.h)
-	set (STEMMER_INTERNAL 1)
-	MARK_AS_ADVANCED(STEMMER_INTERNAL)
-	set (STEMMER_LIBRARY ${CMAKE_SOURCE_DIR}/libstemmer_c/libstemmer.a)
-	set (STEMMER_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libstemmer_c/include)
-else()
+if ( EXISTS ${CMAKE_SOURCE_DIR}/libstemmer_c/include/libstemmer.h )
+	set ( STEMMER_INTERNAL 1 )
+	MARK_AS_ADVANCED ( STEMMER_INTERNAL )
+	set ( STEMMER_LIBRARY ${CMAKE_SOURCE_DIR}/libstemmer_c/libstemmer.a )
+	set ( STEMMER_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/libstemmer_c/include )
+else ()
 
-	FIND_PATH(STEMMER_INCLUDE_DIR libstemmer.h)
+	FIND_PATH ( STEMMER_INCLUDE_DIR libstemmer.h )
 
-	SET(STEMMER_NAMES ${STEMMER_NAMES} stemmer stemmer_c)
-	FIND_LIBRARY(STEMMER_LIBRARY NAMES ${STEMMER_NAMES} )
-endif()
+	SET ( STEMMER_NAMES ${STEMMER_NAMES} stemmer stemmer_c )
+	FIND_LIBRARY ( STEMMER_LIBRARY NAMES ${STEMMER_NAMES} )
+endif ()
 
 
 # handle the QUIETLY and REQUIRED arguments and set STEMMER_FOUND to TRUE if 
 # all listed variables are TRUE
-include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(STEMMER REQUIRED_VARS STEMMER_LIBRARY STEMMER_INCLUDE_DIR)
+include ( ${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS ( STEMMER REQUIRED_VARS STEMMER_LIBRARY STEMMER_INCLUDE_DIR )
 
-MARK_AS_ADVANCED(STEMMER_INCLUDE_DIR STEMMER_LIBRARY)
+MARK_AS_ADVANCED ( STEMMER_INCLUDE_DIR STEMMER_LIBRARY )
 
-if(STEMMER_FOUND)
-	set(STEMMER_LIBRARIES    ${STEMMER_LIBRARY})
-endif()
+if ( STEMMER_FOUND )
+	set ( STEMMER_LIBRARIES ${STEMMER_LIBRARY} )
+endif ()

cmake/SphEndianess.cmake

@@ -1,6 +1,6 @@
 # test whether we build little or big endian, and set USE_LITTLE_ENDIAN accordinly
-include(TestBigEndian)
-test_big_endian (USE_BIG_ENDIAN)
-if (NOT USE_BIG_ENDIAN)
-	set(USE_LITTLE_ENDIAN 1)
-endif(NOT USE_BIG_ENDIAN)
+include ( TestBigEndian )
+test_big_endian ( USE_BIG_ENDIAN )
+if ( NOT USE_BIG_ENDIAN )
+	set ( USE_LITTLE_ENDIAN 1 )
+endif ( NOT USE_BIG_ENDIAN )

cmake/ac_header_stdc.cmake

@@ -1,22 +1,22 @@
 # analogue of AC_HEADER_STDC automake macro.
 # refactored a bit from https://github.com/LuaDist/libgd/blob/master/cmake/modules/AC_HEADER_STDC.cmake
 
-include(CheckIncludeFiles)
-check_include_files("dlfcn.h;stdint.h;stddef.h;inttypes.h;stdlib.h;strings.h;string.h;float.h" StandardHeadersExist)
-if(StandardHeadersExist)
-	check_prototype_exists(free stdlib.h freeExists)
-	if(freeExists)
-		message(STATUS "ANSI C header files - found")
-		set(STDC_HEADERS 1 CACHE INTERNAL "System has ANSI C header files")
-		set(HAVE_STDINT_H 1)
-		set(HAVE_INTTYPES_H 1)
-	endif(freeExists)
-endif(StandardHeadersExist)
+include ( CheckIncludeFiles )
+check_include_files ( "dlfcn.h;stdint.h;stddef.h;inttypes.h;stdlib.h;strings.h;string.h;float.h" StandardHeadersExist )
+if ( StandardHeadersExist )
+	check_prototype_exists ( free stdlib.h freeExists )
+	if ( freeExists )
+		message ( STATUS "ANSI C header files - found" )
+		set ( STDC_HEADERS 1 CACHE INTERNAL "System has ANSI C header files" )
+		set ( HAVE_STDINT_H 1 )
+		set ( HAVE_INTTYPES_H 1 )
+	endif ( freeExists )
+endif ( StandardHeadersExist )
 
-if(NOT STDC_HEADERS)
-	message(STATUS "ANSI C header files - not found")
-	set(STDC_HEADERS 0 CACHE INTERNAL "System has ANSI C header files")
-endif(NOT STDC_HEADERS)
+if ( NOT STDC_HEADERS )
+	message ( STATUS "ANSI C header files - not found" )
+	set ( STDC_HEADERS 0 CACHE INTERNAL "System has ANSI C header files" )
+endif ( NOT STDC_HEADERS )
 
-check_dirsymbol_exists("sys/types.h" HAVE_SYS_TYPES_H)
-check_include_files("stdint.h;inttypes.h" StandardHeadersExist)
+check_dirsymbol_exists ( "sys/types.h" HAVE_SYS_TYPES_H )
+check_include_files ( "stdint.h;inttypes.h" StandardHeadersExist )

cmake/c_flag_overrides.cmake

@@ -1,7 +1,7 @@
 # it defines default compiler flags (specifically /MT instead of default /MD) for windows builds
-	if(MSVC)
-		set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1")
-		set(CMAKE_C_FLAGS_MINSIZEREL_INIT     "/MT /O1 /Ob1 /D NDEBUG")
-		set(CMAKE_C_FLAGS_RELEASE_INIT        "/MT /O2 /Ob2 /D NDEBUG")
-		set(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MT /Zi /O2 /Ob2 /D NDEBUG")
-	endif(MSVC)
+if ( MSVC )
+	set ( CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1" )
+	set ( CMAKE_C_FLAGS_MINSIZEREL_INIT "/MT /O1 /Ob1 /D NDEBUG" )
+	set ( CMAKE_C_FLAGS_RELEASE_INIT "/MT /O2 /Ob2 /D NDEBUG" )
+	set ( CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MT /Zi /O2 /Ob2 /D NDEBUG" )
+endif ( MSVC)

cmake/check_atomic_intrinsics.cmake

@@ -1,6 +1,6 @@
 #find if the sync functions are available
 if ( ${CMAKE_COMPILER_IS_GNUCXX} )
-	set (_CHECK_INTERLOCKED_PROG "
+	set ( _CHECK_INTERLOCKED_PROG "
 int interlocked_routine ( )
 {
 	volatile int ia=0;
@@ -20,12 +20,12 @@ int main(int ac, char*av[]){
 		return *av[0];
 	}
 	return 0;
-}")
+}" )
 
-include(CheckCXXSourceCompiles)
-	CHECK_CXX_SOURCE_COMPILES("${_CHECK_INTERLOCKED_PROG}" _RESULT)
-endif()
+	include ( CheckCXXSourceCompiles )
+	CHECK_CXX_SOURCE_COMPILES ( "${_CHECK_INTERLOCKED_PROG}" _RESULT )
+endif ()
 
-if (_RESULT)
-	set (HAVE_SYNC_FETCH 1)
-endif (_RESULT)
+if ( _RESULT )
+	set ( HAVE_SYNC_FETCH 1 )
+endif ( _RESULT )

cmake/check_unaligned_ram_access.cmake

@@ -1,6 +1,6 @@
 #find if the unaligned RAM access is possible on the build system
 if ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
-	set (_CHECK_UNALIGNED_PROG "
+	set ( _CHECK_UNALIGNED_PROG "
 #include <stdlib.h>
 #include <string.h>
 
@@ -24,12 +24,12 @@ if (!( iRes==0x01020304 || iRes==0x04030201 ))
 	return 1;
 // all seems ok
 return 0;
-}")
+}" )
 
-	include(CheckCXXSourceRuns)
-	CHECK_CXX_SOURCE_RUNS("${_CHECK_UNALIGNED_PROG}" _UNALIGNED_RAM)
-endif()
+	include ( CheckCXXSourceRuns )
+	CHECK_CXX_SOURCE_RUNS ( "${_CHECK_UNALIGNED_PROG}" _UNALIGNED_RAM )
+endif ()
 
-if (_UNALIGNED_RAM)
-	set (UNALIGNED_RAM_ACCESS 1)
-endif (_UNALIGNED_RAM)
+if ( _UNALIGNED_RAM )
+	set ( UNALIGNED_RAM_ACCESS 1 )
+endif ( _UNALIGNED_RAM )

cmake/check_veryold_gcc.cmake

@@ -1,6 +1,6 @@
 #cast away too old compiler
 if ( ${CMAKE_COMPILER_IS_GNUCXX} )
-	set (_CHECK_OLDCOMPILER_SOURCE_CODE "
+	set ( _CHECK_OLDCOMPILER_SOURCE_CODE "
 	#ifdef __GNUC__
 	#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
 	int main() {}
@@ -8,11 +8,11 @@ if ( ${CMAKE_COMPILER_IS_GNUCXX} )
 	syntax error
 	#endif
 	#endif
-	")
+	" )
 
-	include (CheckCXXSourceCompiles)
-	CHECK_CXX_SOURCE_COMPILES("${_CHECK_OLDCOMPILER_SOURCE_CODE}" _RESULT)
-	if (NOT _RESULT)
-		message(FATAL_ERROR "Gcc version error. Minspec is 3.4")
-	endif (NOT _RESULT)
-endif()
+	include ( CheckCXXSourceCompiles )
+	CHECK_CXX_SOURCE_COMPILES ( "${_CHECK_OLDCOMPILER_SOURCE_CODE}" _RESULT )
+	if ( NOT _RESULT )
+		message ( FATAL_ERROR "Gcc version error. Minspec is 3.4" )
+	endif ( NOT _RESULT )
+endif ()

cmake/cxx_flag_overrides.cmake

@@ -1,12 +1,12 @@
 # it defines default compiler flags (specifically /MT instead of default /MD) for windows builds
-	if(MSVC)
-		set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1")
-		set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT     "/MT /O1 /Ob1 /D NDEBUG")
-		set(CMAKE_CXX_FLAGS_RELEASE_INIT        "/MT /O2 /Ob2 /D NDEBUG")
-		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/MT /Zi /O2 /Ob2 /D NDEBUG")
-		if (MSVC90)
-			set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" )
-		else (MSVC90)
-			set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "%(AdditionalDependencies)")
-		endif (MSVC90)
-	endif(MSVC)
+if ( MSVC )
+	set ( CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1" )
+	set ( CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/MT /O1 /Ob1 /D NDEBUG" )
+	set ( CMAKE_CXX_FLAGS_RELEASE_INIT "/MT /O2 /Ob2 /D NDEBUG" )
+	set ( CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/MT /Zi /O2 /Ob2 /D NDEBUG" )
+	if ( MSVC90 )
+		set ( CMAKE_CXX_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib" )
+	else ( MSVC90 )
+		set ( CMAKE_CXX_STANDARD_LIBRARIES_INIT "%(AdditionalDependencies)" )
+	endif ( MSVC90 )
+endif ( MSVC )

cmake/helpers.cmake

@@ -1,28 +1,28 @@
-if(__cmake_helpers_included)
-	return()
-endif()
-set(__cmake_helpers_included YES)
+if ( __cmake_helpers_included )
+	return ()
+endif ()
+set ( __cmake_helpers_included YES )
 
 # check for list of headers, ;-separated. For every existing header.h
 # the HAVE_HEADER_H became defined as 1
-include (CheckIncludeFile)
-macro (ac_check_headers _HEADERS)
-	foreach (it ${_HEADERS})
-		string(REGEX REPLACE "[/.]" "_" _it "${it}")
-		string(TOUPPER "${_it}" _it)
-		check_include_file ("${it}" "HAVE_${_it}")
-	endforeach (it)
-endmacro(ac_check_headers)
+include ( CheckIncludeFile )
+macro( ac_check_headers _HEADERS )
+	foreach ( it ${_HEADERS} )
+		string ( REGEX REPLACE "[/.]" "_" _it "${it}" )
+		string ( TOUPPER "${_it}" _it )
+		check_include_file ( "${it}" "HAVE_${_it}" )
+	endforeach ( it )
+endmacro( ac_check_headers )
 
 # check for list of functions, ;-separated. For every existing
 # function the HAVE_FUNCION became defined as 1
-include (CheckFunctionExists)
-macro (ac_check_funcs _FUNCTIONS)
-	foreach (it ${_FUNCTIONS})
-		string(TOUPPER "${it}" _it)
-		check_function_exists ("${it}" "HAVE_${_it}")
-	endforeach(it)
-endmacro(ac_check_funcs)
+include ( CheckFunctionExists )
+macro( ac_check_funcs _FUNCTIONS )
+	foreach ( it ${_FUNCTIONS} )
+		string ( TOUPPER "${it}" _it )
+		check_function_exists ( "${it}" "HAVE_${_it}" )
+	endforeach ( it )
+endmacro( ac_check_funcs )
 
 macro( ac_check_func_ex _FUNCTION _INCLUDES _LIBS )
 	string ( TOUPPER "${_FUNCTION}" __FUNCTION )
@@ -52,14 +52,14 @@ endmacro( ac_check_func_ex _FUNCTION _INCLUDES _LIBS )
 # VARIABLE - variable to store the result
 #
 
-include(CheckCXXSourceCompiles)
-macro(check_prototype_exists _SYMBOL _HEADER _RESULT)
-	set(_INCLUDE_FILES)
-	foreach(it ${_HEADER})
-		set(_INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n")
-	endforeach(it)
+include ( CheckCXXSourceCompiles )
+macro( check_prototype_exists _SYMBOL _HEADER _RESULT )
+	set ( _INCLUDE_FILES )
+	foreach ( it ${_HEADER} )
+		set ( _INCLUDE_FILES "${_INCLUDE_FILES}#include <${it}>\n" )
+	endforeach ( it )
 
-	set(_CHECK_PROTO_EXISTS_SOURCE_CODE "
+	set ( _CHECK_PROTO_EXISTS_SOURCE_CODE "
 ${_INCLUDE_FILES}
 void cmakeRequireSymbol(int dummy,...){(void)dummy;}
 int main()
@@ -73,9 +73,9 @@ char i = sizeof(&${_SYMBOL});
 #endif
 return 0;
 }
-")
-	CHECK_CXX_SOURCE_COMPILES("${_CHECK_PROTO_EXISTS_SOURCE_CODE}" ${_RESULT})
-endmacro(check_prototype_exists _SYMBOL _HEADER _RESULT)
+" )
+	CHECK_CXX_SOURCE_COMPILES ( "${_CHECK_PROTO_EXISTS_SOURCE_CODE}" ${_RESULT} )
+endmacro( check_prototype_exists _SYMBOL _HEADER _RESULT )
 
 
 # - Check if the symbol is defined in thad header file
@@ -98,11 +98,11 @@ int main() { return 0; }
 #else
 #error NO_SYMBOLS
 #endif
-")
+" )
 	CHECK_CXX_SOURCE_COMPILES ( "${_CHECK_PROTO_EXISTS_SOURCE_CODE}" ${_RESULT} )
 endmacro( check_symbol_defined _SYMBOL _HEADER _RESULT )
 
-macro(SPHINX_CHECK_DEFINE _SYMBOL _HEADER)
+macro( SPHINX_CHECK_DEFINE _SYMBOL _HEADER )
 	string ( TOUPPER "${_SYMBOL}" __SYMBOL )
 	check_symbol_defined ( "${_SYMBOL}" "${_HEADER}" "HAVE_${__SYMBOL}" )
 endmacro( SPHINX_CHECK_DEFINE _SYMBOL _HEADER )
@@ -126,158 +126,158 @@ endmacro( SPHINX_CHECK_DEFINE _SYMBOL _HEADER )
 # CMAKE_REQUIRED_INCLUDES = list of include directories
 # CMAKE_REQUIRED_LIBRARIES = list of libraries to link
 
-MACRO(CHECK_DIRSYMBOL_EXISTS FILES VARIABLE)
-	IF(NOT DEFINED ${VARIABLE})
-		SET(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n")
-		SET(MACRO_CHECK_DIRSYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS})
-		IF(CMAKE_REQUIRED_LIBRARIES)
-			SET(CHECK_DIRSYMBOL_EXISTS_LIBS
-				"-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
-		ELSE(CMAKE_REQUIRED_LIBRARIES)
-			SET(CHECK_DIRSYMBOL_EXISTS_LIBS)
-		ENDIF(CMAKE_REQUIRED_LIBRARIES)
-		IF(CMAKE_REQUIRED_INCLUDES)
-			SET(CMAKE_DIRSYMBOL_EXISTS_INCLUDES
-				"-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
-		ELSE(CMAKE_REQUIRED_INCLUDES)
-			SET(CMAKE_DIRSYMBOL_EXISTS_INCLUDES)
-		ENDIF(CMAKE_REQUIRED_INCLUDES)
-		FOREACH(FILE ${FILES})
-			SET(CMAKE_CONFIGURABLE_FILE_CONTENT
-				"${CMAKE_CONFIGURABLE_FILE_CONTENT}#include <${FILE}>\n")
-		ENDFOREACH(FILE)
-		SET(CMAKE_CONFIGURABLE_FILE_CONTENT
-			"${CMAKE_CONFIGURABLE_FILE_CONTENT}\nint main()\n{if ((DIR *) 0) return 0;}\n")
+MACRO( CHECK_DIRSYMBOL_EXISTS FILES VARIABLE )
+	IF ( NOT DEFINED ${VARIABLE} )
+		SET ( CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n" )
+		SET ( MACRO_CHECK_DIRSYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS} )
+		IF ( CMAKE_REQUIRED_LIBRARIES )
+			SET ( CHECK_DIRSYMBOL_EXISTS_LIBS
+					"-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}" )
+		ELSE ( CMAKE_REQUIRED_LIBRARIES )
+			SET ( CHECK_DIRSYMBOL_EXISTS_LIBS )
+		ENDIF ( CMAKE_REQUIRED_LIBRARIES )
+		IF ( CMAKE_REQUIRED_INCLUDES )
+			SET ( CMAKE_DIRSYMBOL_EXISTS_INCLUDES
+					"-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}" )
+		ELSE ( CMAKE_REQUIRED_INCLUDES )
+			SET ( CMAKE_DIRSYMBOL_EXISTS_INCLUDES )
+		ENDIF ( CMAKE_REQUIRED_INCLUDES )
+		FOREACH ( FILE ${FILES} )
+			SET ( CMAKE_CONFIGURABLE_FILE_CONTENT
+					"${CMAKE_CONFIGURABLE_FILE_CONTENT}#include <${FILE}>\n" )
+		ENDFOREACH ( FILE )
+		SET ( CMAKE_CONFIGURABLE_FILE_CONTENT
+				"${CMAKE_CONFIGURABLE_FILE_CONTENT}\nint main()\n{if ((DIR *) 0) return 0;}\n" )
 
-		CONFIGURE_FILE("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in"
-			"${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckDIRSymbolExists.c" @ONLY)
+		CONFIGURE_FILE ( "${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in"
+				"${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckDIRSymbolExists.c" @ONLY )
 
-		MESSAGE(STATUS "Looking for DIR in ${FILES}")
-		TRY_COMPILE(${VARIABLE}
-			${CMAKE_BINARY_DIR}
-			${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckDIRSymbolExists.c
-			COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
-			CMAKE_FLAGS
-			-DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_DIRSYMBOL_EXISTS_FLAGS}
-			"${CHECK_DIRSYMBOL_EXISTS_LIBS}"
-			"${CMAKE_DIRSYMBOL_EXISTS_INCLUDES}"
-			OUTPUT_VARIABLE OUTPUT)
-		IF(${VARIABLE})
-			MESSAGE(STATUS "Looking for DIR in ${FILES} - found")
-			SET(${VARIABLE} 1 CACHE INTERNAL "Have symbol DIR")
-			FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log
-				"Determining if the DIR symbol is defined as in AC_HEADER_DIRENT "
-				"passed with the following output:\n"
-				"${OUTPUT}\nFile ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckDIRSymbolExists.c:\n"
-				"${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
-		ELSE(${VARIABLE})
-			MESSAGE(STATUS "Looking for DIR in ${FILES} - not found.")
-			SET(${VARIABLE} "" CACHE INTERNAL "Have symbol DIR")
-			FILE(APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
-				"Determining if the DIR symbol is defined as in AC_HEADER_DIRENT "
-				"failed with the following output:\n"
-				"${OUTPUT}\nFile ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckDIRSymbolExists.c:\n"
-				"${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
-		ENDIF(${VARIABLE})
-	ENDIF(NOT DEFINED ${VARIABLE})
-ENDMACRO(CHECK_DIRSYMBOL_EXISTS)
+		MESSAGE ( STATUS "Looking for DIR in ${FILES}" )
+		TRY_COMPILE ( ${VARIABLE}
+				${CMAKE_BINARY_DIR}
+				${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckDIRSymbolExists.c
+				COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
+				CMAKE_FLAGS
+				-DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_DIRSYMBOL_EXISTS_FLAGS}
+				"${CHECK_DIRSYMBOL_EXISTS_LIBS}"
+				"${CMAKE_DIRSYMBOL_EXISTS_INCLUDES}"
+				OUTPUT_VARIABLE OUTPUT )
+		IF ( ${VARIABLE} )
+			MESSAGE ( STATUS "Looking for DIR in ${FILES} - found" )
+			SET ( ${VARIABLE} 1 CACHE INTERNAL "Have symbol DIR" )
+			FILE ( APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log
+					"Determining if the DIR symbol is defined as in AC_HEADER_DIRENT "
+					"passed with the following output:\n"
+					"${OUTPUT}\nFile ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckDIRSymbolExists.c:\n"
+					"${CMAKE_CONFIGURABLE_FILE_CONTENT}\n" )
+		ELSE ( ${VARIABLE} )
+			MESSAGE ( STATUS "Looking for DIR in ${FILES} - not found." )
+			SET ( ${VARIABLE} "" CACHE INTERNAL "Have symbol DIR" )
+			FILE ( APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
+					"Determining if the DIR symbol is defined as in AC_HEADER_DIRENT "
+					"failed with the following output:\n"
+					"${OUTPUT}\nFile ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckDIRSymbolExists.c:\n"
+					"${CMAKE_CONFIGURABLE_FILE_CONTENT}\n" )
+		ENDIF ( ${VARIABLE} )
+	ENDIF ( NOT DEFINED ${VARIABLE} )
+ENDMACRO( CHECK_DIRSYMBOL_EXISTS )
 
 
-include(CheckLibraryExists)
-macro( AC_SEARCH_LIBS LIB_REQUIRED FUNCTION_NAME TARGET_VAR LIB_DIR)
-# check if we can use FUNCTION_NAME first.
-# if possible without extra libs - ok. If no - try to use LIB_REQUIRED list.
-# finally define TARGET_VAR as 1 if found, and also append found (if necessary) library path to LIB_DIR
-#if(${LIB_REQUIRED})
-	string(TOUPPER "${FUNCTION_NAME}" _upcase_name)
-	check_function_exists ("${FUNCTION_NAME}" "HAVE_${_upcase_name}")
-	if (HAVE_${_upcase_name} )
-		set (${TARGET_VAR} 1 )
-	else (HAVE_${_upcase_name})
-	foreach( LIB ${LIB_REQUIRED} )
-		UNSET(_LIB_PATH CACHE)
-			find_library(_LIB_PATH ${LIB})
-			UNSET (_LIB_FUNCTION_FOUND CACHE)
-			check_library_exists(${LIB} ${FUNCTION_NAME} ${_LIB_PATH} _LIB_FUNCTION_FOUND )
-			if( ${_LIB_FUNCTION_FOUND} )
-				set(${TARGET_VAR} 1)
-				set (${LIB_DIR} "${${LIB_DIR}};${_LIB_PATH}")
-				break()
-			endif()
-		endforeach( LIB )
-		UNSET(_LIB_PATH CACHE)
-	endif()
-#endif(${LIB_REQUIRED})
+include ( CheckLibraryExists )
+macro( AC_SEARCH_LIBS LIB_REQUIRED FUNCTION_NAME TARGET_VAR LIB_DIR )
+	# check if we can use FUNCTION_NAME first.
+	# if possible without extra libs - ok. If no - try to use LIB_REQUIRED list.
+	# finally define TARGET_VAR as 1 if found, and also append found (if necessary) library path to LIB_DIR
+	#if(${LIB_REQUIRED})
+	string ( TOUPPER "${FUNCTION_NAME}" _upcase_name )
+	check_function_exists ( "${FUNCTION_NAME}" "HAVE_${_upcase_name}" )
+	if ( HAVE_${_upcase_name} )
+		set ( ${TARGET_VAR} 1 )
+	else ( HAVE_${_upcase_name} )
+		foreach ( LIB ${LIB_REQUIRED} )
+			UNSET ( _LIB_PATH CACHE )
+			find_library ( _LIB_PATH ${LIB} )
+			UNSET ( _LIB_FUNCTION_FOUND CACHE )
+			check_library_exists ( ${LIB} ${FUNCTION_NAME} ${_LIB_PATH} _LIB_FUNCTION_FOUND )
+			if ( ${_LIB_FUNCTION_FOUND} )
+				set ( ${TARGET_VAR} 1 )
+				set ( ${LIB_DIR} "${${LIB_DIR}};${_LIB_PATH}" )
+				break ()
+			endif ()
+		endforeach ( LIB )
+		UNSET ( _LIB_PATH CACHE )
+	endif ()
+	#endif(${LIB_REQUIRED})
 endmacro()
 
 
-macro(REMOVE_CRLF RETVAL INSTR)
-	if (NOT INSTR EQUAL "")
-		string(REGEX REPLACE "\n" "" ${RETVAL} ${INSTR})
-	endif()
-#	set(${RETVAL} "${RETVAL}" PARENT_SCOPE)
+macro( REMOVE_CRLF RETVAL INSTR )
+	if ( NOT INSTR EQUAL "" )
+		string ( REGEX REPLACE "\n" "" ${RETVAL} ${INSTR} )
+	endif ()
+	#	set(${RETVAL} "${RETVAL}" PARENT_SCOPE)
 endmacro()
 
 # check if PACKAGE is available.
 # if so, add the option to use or don't use the package.
 # if the option set, set OUTVAR to 1, append the lib path to LIB_DIR, include directories
-include (CMakeDependentOption)
-macro(OPTION_MENU PACKAGE PROMPT OUTVAR LIB_DIR)
-	find_package (${PACKAGE} QUIET)
-	CMAKE_DEPENDENT_OPTION (WITH_${PACKAGE} "${PROMPT}" ON "${PACKAGE}_FOUND" OFF)
-	IF (WITH_${PACKAGE})
-		set (${OUTVAR} 1)
-		if (${PACKAGE}_LIBRARIES)
-			list (APPEND ${LIB_DIR} ${${PACKAGE}_LIBRARIES})
-		endif (${PACKAGE}_LIBRARIES)
-		include_directories (${${PACKAGE}_INCLUDE_DIRS})
-	ENDIF (WITH_${PACKAGE})
+include ( CMakeDependentOption )
+macro( OPTION_MENU PACKAGE PROMPT OUTVAR LIB_DIR )
+	find_package ( ${PACKAGE} QUIET )
+	CMAKE_DEPENDENT_OPTION ( WITH_${PACKAGE} "${PROMPT}" ON "${PACKAGE}_FOUND" OFF )
+	IF ( WITH_${PACKAGE} )
+		set ( ${OUTVAR} 1 )
+		if ( ${PACKAGE}_LIBRARIES )
+			list ( APPEND ${LIB_DIR} ${${PACKAGE}_LIBRARIES} )
+		endif ( ${PACKAGE}_LIBRARIES )
+		include_directories ( ${${PACKAGE}_INCLUDE_DIRS} )
+	ENDIF ( WITH_${PACKAGE} )
 endmacro()
 
 # add debug symbols to the target
-function (INSTALL_DBG BINARYNAME)
-	if (MSVC)
+function( INSTALL_DBG BINARYNAME )
+	if ( MSVC )
 		# windows case. The pdbs are located in bin/config/*.pdb
-		set (PDB_PATH "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
-		INSTALL (FILES ${PDB_PATH}/${BINARYNAME}.pdb DESTINATION debug COMPONENT DBGSYMBOLS)
-	elseif (APPLE)
+		set ( PDB_PATH "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}" )
+		INSTALL ( FILES ${PDB_PATH}/${BINARYNAME}.pdb DESTINATION debug COMPONENT DBGSYMBOLS )
+	elseif ( APPLE )
 		# Mac OS case. We have to explicitly extract dSYM and then strip the binary
-		if (NOT DEFINED CMAKE_DSYMUTIL)
-			find_program (CMAKE_DSYMUTIL dsymutil)
+		if ( NOT DEFINED CMAKE_DSYMUTIL )
+			find_program ( CMAKE_DSYMUTIL dsymutil )
 		endif ()
-		if (NOT DEFINED CMAKE_DSYMUTIL)
-			message (SEND_ERROR "Missed objcopy prog. Can't split symbols!")
-			unset (SPLIT_SYMBOLS CACHE)
+		if ( NOT DEFINED CMAKE_DSYMUTIL )
+			message ( SEND_ERROR "Missed objcopy prog. Can't split symbols!" )
+			unset ( SPLIT_SYMBOLS CACHE )
 		endif ()
-		mark_as_advanced (CMAKE_DSYMUTIL)
+		mark_as_advanced ( CMAKE_DSYMUTIL )
 
-		ADD_CUSTOM_COMMAND (TARGET ${BINARYNAME} POST_BUILD
+		ADD_CUSTOM_COMMAND ( TARGET ${BINARYNAME} POST_BUILD
 				COMMAND ${CMAKE_DSYMUTIL} -f $<TARGET_FILE:${BINARYNAME}> -o $<TARGET_FILE:${BINARYNAME}>.dSYM
 				COMMAND strip -S $<TARGET_FILE:${BINARYNAME}>
-		)
-		INSTALL (FILES ${SPHINXSEARCH_BINARY_DIR}/src/${BINARYNAME}.dSYM
-				DESTINATION lib/debug/usr/bin COMPONENT DBGSYMBOLS)
-	else()
+				)
+		INSTALL ( FILES ${SPHINXSEARCH_BINARY_DIR}/src/${BINARYNAME}.dSYM
+				DESTINATION lib/debug/usr/bin COMPONENT DBGSYMBOLS )
+	else ()
 		# non-windows case. For linux - use objcopy to make 'clean' and 'debug' binaries
-		if (NOT DEFINED CMAKE_OBJCOPY)
-			find_package (BinUtils QUIET)
+		if ( NOT DEFINED CMAKE_OBJCOPY )
+			find_package ( BinUtils QUIET )
 		endif ()
-		if (NOT DEFINED CMAKE_OBJCOPY)
-			find_program (CMAKE_OBJCOPY objcopy)
+		if ( NOT DEFINED CMAKE_OBJCOPY )
+			find_program ( CMAKE_OBJCOPY objcopy )
 		endif ()
-		if (NOT DEFINED CMAKE_OBJCOPY)
-			message (SEND_ERROR "Missed objcopy prog. Can't split symbols!")
-			unset (SPLIT_SYMBOLS CACHE)
-		endif (NOT DEFINED CMAKE_OBJCOPY)
-		mark_as_advanced (CMAKE_OBJCOPY)
-		mark_as_advanced (BinUtils_DIR)
+		if ( NOT DEFINED CMAKE_OBJCOPY )
+			message ( SEND_ERROR "Missed objcopy prog. Can't split symbols!" )
+			unset ( SPLIT_SYMBOLS CACHE )
+		endif ( NOT DEFINED CMAKE_OBJCOPY )
+		mark_as_advanced ( CMAKE_OBJCOPY )
+		mark_as_advanced ( BinUtils_DIR )
 
-		ADD_CUSTOM_COMMAND (TARGET ${BINARYNAME} POST_BUILD
+		ADD_CUSTOM_COMMAND ( TARGET ${BINARYNAME} POST_BUILD
 				COMMAND ${CMAKE_OBJCOPY} --only-keep-debug $<TARGET_FILE:${BINARYNAME}> $<TARGET_FILE:${BINARYNAME}>.dbg
 				COMMAND ${CMAKE_OBJCOPY} --strip-debug $<TARGET_FILE:${BINARYNAME}>
 				COMMAND ${CMAKE_OBJCOPY} --add-gnu-debuglink=$<TARGET_FILE:${BINARYNAME}>.dbg $<TARGET_FILE:${BINARYNAME}>
-		)
-		INSTALL (FILES ${SPHINXSEARCH_BINARY_DIR}/src/${BINARYNAME}.dbg
-				DESTINATION lib/debug/usr/bin COMPONENT DBGSYMBOLS RENAME ${BINARYNAME})
+				)
+		INSTALL ( FILES ${SPHINXSEARCH_BINARY_DIR}/src/${BINARYNAME}.dbg
+				DESTINATION lib/debug/usr/bin COMPONENT DBGSYMBOLS RENAME ${BINARYNAME} )
 	endif ()
 endfunction()

cmake/select_library_dir.cmake

@@ -3,59 +3,59 @@
 # like having all in c:/work, we can investigate c:/work/mysql, c:/work/expat*, etc to find headers and libs,
 # or c:/work/mysql-x64, c:/work/expat*-x64, etc to find headers and libs for x64 arch build
 
-SET (LIBS_BUNDLE "${LIBS_BUNDLE}" CACHE PATH "Choose the path to the dir which contains all helper libs like expat, mysql, etc." FORCE )
-if (LIBS_BUNDLE)
-	set (is64bit FALSE)
-	IF (CMAKE_EXE_LINKER_FLAGS MATCHES "x64")
-		SET(is64bit TRUE)
-	endif()
+SET ( LIBS_BUNDLE "${LIBS_BUNDLE}" CACHE PATH "Choose the path to the dir which contains all helper libs like expat, mysql, etc." FORCE )
+if ( LIBS_BUNDLE )
+	set ( is64bit FALSE )
+	IF ( CMAKE_EXE_LINKER_FLAGS MATCHES "x64" )
+		SET ( is64bit TRUE )
+	endif ()
 
 	# here is the list of the libs we expect to find
-	foreach (req_lib expat iconv mysql pq)
-		file(GLOB list_libs "${LIBS_BUNDLE}/*${req_lib}*" "${LIBS_BUNDLE}/*pgsql*")
-		SET (flib FALSE)
+	foreach ( req_lib expat iconv mysql pq )
+		file ( GLOB list_libs "${LIBS_BUNDLE}/*${req_lib}*" "${LIBS_BUNDLE}/*pgsql*" )
+		SET ( flib FALSE )
 		# select whether we need -x64 or simple lib for our current arch
-		FOREACH (lib ${list_libs})
-			if (is64bit)
-				if (lib MATCHES "x64")
-					SET(flib "${lib}")
-					break()
-				endif (lib MATCHES "x64")
-			else (is64bit)
-				if (NOT lib MATCHES "x64")
-					SET (flib "${lib}")
-					break()
-				endif (NOT lib MATCHES "x64")
-			endif(is64bit)
-		endforeach()
-		if (req_lib STREQUAL "pq")
-			set (test_h "libpq-fe")
-		else()
-			set(test_h "${req_lib}")
-		endif()
+		FOREACH ( lib ${list_libs} )
+			if ( is64bit )
+				if ( lib MATCHES "x64" )
+					SET ( flib "${lib}" )
+					break ()
+				endif ( lib MATCHES "x64" )
+			else ( is64bit )
+				if ( NOT lib MATCHES "x64" )
+					SET ( flib "${lib}" )
+					break ()
+				endif ( NOT lib MATCHES "x64" )
+			endif ( is64bit )
+		endforeach ()
+		if ( req_lib STREQUAL "pq" )
+			set ( test_h "libpq-fe" )
+		else ()
+			set ( test_h "${req_lib}" )
+		endif ()
 		# now try to find all the necessary paths. They are different, and so, mixed right here.
-		find_path(${req_lib}_include
-			"${test_h}.h"
-			"${flib}/include"
-			"${flib}/source/lib" NO_DEFAULT_PATH)
-		message(STATUS "Looking for ${req_lib}")
-		find_library(MY_${req_lib}
-			NAMES ${req_lib}
+		find_path ( ${req_lib}_include
+				"${test_h}.h"
+				"${flib}/include"
+				"${flib}/source/lib" NO_DEFAULT_PATH )
+		message ( STATUS "Looking for ${req_lib}" )
+		find_library ( MY_${req_lib}
+				NAMES ${req_lib}
 				lib${req_lib}
-			PATHS "${flib}/lib/opt"
+				PATHS "${flib}/lib/opt"
 				"${flib}/libs"
 				"${flib}/lib"
-			NO_DEFAULT_PATH)
-		message(STATUS ${MY_${req_lib}})
-		if (MY_${req_lib})
-			set("HAVE_${req_lib}" 1)
-			set(${req_lib}_LIB "${MY_${req_lib}}")
-			set(${req_lib}_ROOT "${flib}")
-			unset(MY_${req_lib} CACHE)
-		endif()
+				NO_DEFAULT_PATH )
+		message ( STATUS ${MY_${req_lib}} )
+		if ( MY_${req_lib} )
+			set ( "HAVE_${req_lib}" 1 )
+			set ( ${req_lib}_LIB "${MY_${req_lib}}" )
+			set ( ${req_lib}_ROOT "${flib}" )
+			unset ( MY_${req_lib} CACHE )
+		endif ()
 		if ( ${req_lib}_include )
-			set(${req_lib}_INCLUDE "${${req_lib}_include}")
+			set ( ${req_lib}_INCLUDE "${${req_lib}_include}" )
 			mark_as_advanced ( ${req_lib}_include )
-		endif()
-	endforeach()
-endif()
+		endif ()
+	endforeach ()
+endif ()

libre2/CMakeLists.txt

@@ -1,63 +1,63 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required ( VERSION 2.8 )
 
-PROJECT(RE2)
+PROJECT ( RE2 )
 #Parses Makefile and creates the own project based on it
 #(actually we only use OFILES var from there)
 
-FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/MakefileOrig" _CONTENT)
+FILE ( READ "${CMAKE_CURRENT_SOURCE_DIR}/MakefileOrig" _CONTENT )
 # replace '\ ' into one big line
-STRING(REGEX REPLACE "\\\\\n" " " _CONTENT "${_CONTENT}")
+STRING ( REGEX REPLACE "\\\\\n" " " _CONTENT "${_CONTENT}" )
 # escape ';' (if any)
-STRING(REGEX REPLACE ";" "\\\\;" _CONTENT "${_CONTENT}")
+STRING ( REGEX REPLACE ";" "\\\\;" _CONTENT "${_CONTENT}" )
 # now replace lf into ';' (it makes list from the line)
-STRING(REGEX REPLACE "\n" ";" _CONTENT "${_CONTENT}")
-FOREACH (LINE ${_CONTENT})
+STRING ( REGEX REPLACE "\n" ";" _CONTENT "${_CONTENT}" )
+FOREACH ( LINE ${_CONTENT} )
 	# skip comments (beginning with #)
-	IF(NOT "${LINE}" MATCHES "^#.*")
+	IF ( NOT "${LINE}" MATCHES "^#.*" )
 		# parse 'name=value1 value2..." - extract the 'name' part
-		STRING(REGEX REPLACE "=.*$" "" _NAME "${LINE}")
+		STRING ( REGEX REPLACE "=.*$" "" _NAME "${LINE}" )
 		# extract the list of values part
-		STRING(REGEX REPLACE "^.*=" "" _LIST "${LINE}")
+		STRING ( REGEX REPLACE "^.*=" "" _LIST "${LINE}" )
 		# replace (multi)spaces into ';' (it makes list from the line)
-		separate_arguments(_LIST UNIX_COMMAND "${_LIST}")
+		separate_arguments ( _LIST UNIX_COMMAND "${_LIST}" )
 		# finally get our two variables
 		if ( _NAME STREQUAL "OFILES" )
-			SET (_OBJ "${_LIST}")
-		endif()
+			SET ( _OBJ "${_LIST}" )
+		endif ()
 		# INSTALL_HFILES and HFILES are not necessary for build,
 		# however it is good if we put them into solution (just for a human that will open them)
 		if ( _NAME STREQUAL "INSTALL_HFILES" )
-        	SET (_IHF "${_LIST}")
-        	source_group ("Install headers" FILES ${_IHF})
-        endif()
-        if ( _NAME STREQUAL "HFILES" )
-        	SET (_HF "${_LIST}")
-        	source_group ("Headers" FILES ${_HF})
-		endif()
-	endif()
-endforeach()
+			SET ( _IHF "${_LIST}" )
+			source_group ( "Install headers" FILES ${_IHF} )
+		endif ()
+		if ( _NAME STREQUAL "HFILES" )
+			SET ( _HF "${_LIST}" )
+			source_group ( "Headers" FILES ${_HF} )
+		endif ()
+	endif ()
+endforeach ()
 
 if ( _OBJ )
-	set (SOURCES "")
-	foreach(OBJ ${_OBJ})
-		get_filename_component(NAME ${OBJ} NAME_WE)
-		get_filename_component(DIR ${OBJ} DIRECTORY)
+	set ( SOURCES "" )
+	foreach ( OBJ ${_OBJ} )
+		get_filename_component ( NAME ${OBJ} NAME_WE )
+		get_filename_component ( DIR ${OBJ} DIRECTORY )
 		# exclude leading 'obj/' from all the paths.
-		STRING(REGEX REPLACE "^obj/" "" DIR "${DIR}")
-		LIST(APPEND SOURCES "${DIR}/${NAME}.cc")
-	endforeach()
-else(_OBJ)
-	MESSAGE(ERROR "No OFILE definition found in Makefile")
-endif(_OBJ)
+		STRING ( REGEX REPLACE "^obj/" "" DIR "${DIR}" )
+		LIST ( APPEND SOURCES "${DIR}/${NAME}.cc" )
+	endforeach ()
+else ( _OBJ )
+	MESSAGE ( ERROR "No OFILE definition found in Makefile" )
+endif ( _OBJ )
 
 
-include_directories(".")
-IF(CMAKE_COMPILER_IS_GNUCXX)
-    SET(CMAKE_CXX_FLAGS "-Wall -O3 -g -pthread -Wsign-compare -c ")
-ELSEIF (MSVC)
-	set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Oi /GL")
-	add_definitions("/D NOMINMAX")
-ENDIF()
-add_definitions("-DNDEBUG")
+include_directories ( "." )
+IF ( CMAKE_COMPILER_IS_GNUCXX )
+	SET ( CMAKE_CXX_FLAGS "-Wall -O3 -g -pthread -Wsign-compare -c " )
+ELSEIF ( MSVC )
+	set ( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Oi /GL" )
+	add_definitions ( "/D NOMINMAX" )
+ENDIF ()
+add_definitions ( "-DNDEBUG" )
 add_library ( RE2 STATIC ${SOURCES} ${_HF} ${_IHF} )
 

libstemmer_c/CMakeLists.txt

@@ -1,32 +1,32 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required ( VERSION 2.8 )
 
-PROJECT(stemmer)
-FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/mkinc.mak" _CONTENT)
+PROJECT ( stemmer )
+FILE ( READ "${CMAKE_CURRENT_SOURCE_DIR}/mkinc.mak" _CONTENT )
 # replace '\ ' into one big line
-STRING(REGEX REPLACE "\\\\\n" " " _CONTENT "${_CONTENT}")
+STRING ( REGEX REPLACE "\\\\\n" " " _CONTENT "${_CONTENT}" )
 # escape ';' (if any)
-STRING(REGEX REPLACE ";" "\\\\;" _CONTENT "${_CONTENT}")
+STRING ( REGEX REPLACE ";" "\\\\;" _CONTENT "${_CONTENT}" )
 # now replace lf into ';' (it makes list from the line)
-STRING(REGEX REPLACE "\n" ";" _CONTENT "${_CONTENT}")
-FOREACH (LINE ${_CONTENT})
+STRING ( REGEX REPLACE "\n" ";" _CONTENT "${_CONTENT}" )
+FOREACH ( LINE ${_CONTENT} )
 	# skip comments (beginning with #)
-	IF(NOT "${LINE}" MATCHES "^#.*")
+	IF ( NOT "${LINE}" MATCHES "^#.*" )
 		# parse 'name=value1 value2..." - extract the 'name' part
-		STRING(REGEX REPLACE "=.*$" "" _NAME "${LINE}")
+		STRING ( REGEX REPLACE "=.*$" "" _NAME "${LINE}" )
 		# extract the list of values part
-		STRING(REGEX REPLACE "^.*=" "" _LIST "${LINE}")
+		STRING ( REGEX REPLACE "^.*=" "" _LIST "${LINE}" )
 		# replace (multi)spaces into ';' (it makes list from the line)
-		STRING(REGEX REPLACE " +" ";" _LIST "${_LIST}")
+		STRING ( REGEX REPLACE " +" ";" _LIST "${_LIST}" )
 		# finally get our two variables
-		IF("${_NAME}" MATCHES "snowball_sources")
-			SET (_SOURCES "${_LIST}")
-		ELSEIF ("${_NAME}" MATCHES "snowball_headers")
-			SET (_HEADERS "${_LIST}")
-		ENDIF()
-	endif()
-endforeach()
+		IF ( "${_NAME}" MATCHES "snowball_sources" )
+			SET ( _SOURCES "${_LIST}" )
+		ELSEIF ( "${_NAME}" MATCHES "snowball_headers" )
+			SET ( _HEADERS "${_LIST}" )
+		ENDIF ()
+	endif ()
+endforeach ()
 # all the sources parsed. Now just add the lib
-add_library (stemmer STATIC ${_SOURCES} ${_HEADERS})
+add_library ( stemmer STATIC ${_SOURCES} ${_HEADERS} )
 #SET (STEMMER_INCLUDE_DIR "${SPHINXSEARCH_SOURCE_DIR}/libstemmer_c/include" PARENT_SCOPE )
 #SET (STEMMER_LIBRARIES stemmer PARENT_SCOPE)
 #SET (STEMMER_FOUND TRUE PARENT_SCOPE)

sphinxrev.cmake

@@ -1,116 +1,116 @@
 # this cmake file fully replaces all old things like svnxrev, hgxrev, etc scripts.
-cmake_minimum_required (VERSION 2.8)
-if(CMAKE_VERSION VERSION_GREATER "3.1")
-	CMAKE_POLICY(SET CMP0053 OLD)
-endif()
+cmake_minimum_required ( VERSION 2.8 )
+if ( CMAKE_VERSION VERSION_GREATER "3.1" )
+	CMAKE_POLICY ( SET CMP0053 OLD )
+endif ()
 
 # first try to use binary git
-if (EXISTS "${SOURCE_DIR}/.git")
-	find_package(Git)
-	if (GIT_FOUND)
-		execute_process(COMMAND "${GIT_EXECUTABLE}" log -1 --format=%h
-			WORKING_DIRECTORY "${SOURCE_DIR}"
-			RESULT_VARIABLE res
-			OUTPUT_VARIABLE HEAD_HASH
-			ERROR_QUIET
-			OUTPUT_STRIP_TRAILING_WHITESPACE)
-		execute_process(COMMAND "${GIT_EXECUTABLE}" status -s -b
-			WORKING_DIRECTORY "${SOURCE_DIR}"
-			RESULT_VARIABLE res
-			OUTPUT_VARIABLE HEAD_BRANCH
-			ERROR_QUIET
-			OUTPUT_STRIP_TRAILING_WHITESPACE)
-		string(REGEX REPLACE "\n.*$" "" HEAD_BRANCH "${HEAD_BRANCH}")
-		string(REPLACE "## " "" HEAD_BRANCH "${HEAD_BRANCH}")
-	else (GIT_FOUND)
+if ( EXISTS "${SOURCE_DIR}/.git" )
+	find_package ( Git )
+	if ( GIT_FOUND )
+		execute_process ( COMMAND "${GIT_EXECUTABLE}" log -1 --format=%h
+				WORKING_DIRECTORY "${SOURCE_DIR}"
+				RESULT_VARIABLE res
+				OUTPUT_VARIABLE HEAD_HASH
+				ERROR_QUIET
+				OUTPUT_STRIP_TRAILING_WHITESPACE )
+		execute_process ( COMMAND "${GIT_EXECUTABLE}" status -s -b
+				WORKING_DIRECTORY "${SOURCE_DIR}"
+				RESULT_VARIABLE res
+				OUTPUT_VARIABLE HEAD_BRANCH
+				ERROR_QUIET
+				OUTPUT_STRIP_TRAILING_WHITESPACE )
+		string ( REGEX REPLACE "\n.*$" "" HEAD_BRANCH "${HEAD_BRANCH}" )
+		string ( REPLACE "## " "" HEAD_BRANCH "${HEAD_BRANCH}" )
+	else ( GIT_FOUND )
 		# first try to use git revision as the most modern flow
-		set(GIT_DIR "${SOURCE_DIR}/.git")
-		if(EXISTS "${GIT_DIR}/HEAD")
+		set ( GIT_DIR "${SOURCE_DIR}/.git" )
+		if ( EXISTS "${GIT_DIR}/HEAD" )
 
-			message (STATUS "Using git working copy to provide branch and tag data")
-			set(GIT_DATA "${BINARY_DIR}/CMakeFiles/git-data")
-			if(NOT EXISTS "${GIT_DATA}")
-				file(MAKE_DIRECTORY "${GIT_DATA}")
-			endif()
+			message ( STATUS "Using git working copy to provide branch and tag data" )
+			set ( GIT_DATA "${BINARY_DIR}/CMakeFiles/git-data" )
+			if ( NOT EXISTS "${GIT_DATA}" )
+				file ( MAKE_DIRECTORY "${GIT_DATA}" )
+			endif ()
 
-			set(HEAD_FILE "${GIT_DIR}/HEAD")
+			set ( HEAD_FILE "${GIT_DIR}/HEAD" )
 
-			file(READ ${HEAD_FILE} HEAD_CONTENTS LIMIT 1024)
-			string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
-			if(HEAD_CONTENTS MATCHES "ref")
+			file ( READ ${HEAD_FILE} HEAD_CONTENTS LIMIT 1024 )
+			string ( STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS )
+			if ( HEAD_CONTENTS MATCHES "ref" )
 				# named branch
-				string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
-				if(EXISTS "${GIT_DIR}/${HEAD_REF}")
-					configure_file("${GIT_DIR}/${HEAD_REF}" "${GIT_DATA}/head-ref" COPYONLY)
-				else()
-					configure_file("${GIT_DIR}/packed-refs" "${GIT_DATA}/packed-refs" COPYONLY)
-					file(READ "${GIT_DATA}/packed-refs" PACKED_REFS)
-					if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}")
-						set(HEAD_HASH "${CMAKE_MATCH_1}")
-					endif()
-				endif()
-				get_filename_component(HEAD_BRANCH ${GIT_DIR}/${HEAD_REF} NAME)
-				string(STRIP "${HEAD_BRANCH}" HEAD_BRANCH)
-			else()
+				string ( REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}" )
+				if ( EXISTS "${GIT_DIR}/${HEAD_REF}" )
+					configure_file ( "${GIT_DIR}/${HEAD_REF}" "${GIT_DATA}/head-ref" COPYONLY )
+				else ()
+					configure_file ( "${GIT_DIR}/packed-refs" "${GIT_DATA}/packed-refs" COPYONLY )
+					file ( READ "${GIT_DATA}/packed-refs" PACKED_REFS )
+					if ( ${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}" )
+						set ( HEAD_HASH "${CMAKE_MATCH_1}" )
+					endif ()
+				endif ()
+				get_filename_component ( HEAD_BRANCH ${GIT_DIR}/${HEAD_REF} NAME )
+				string ( STRIP "${HEAD_BRANCH}" HEAD_BRANCH )
+			else ()
 				# detached HEAD
-				configure_file("${GIT_DIR}/HEAD" "${GIT_DATA}/head-ref" COPYONLY)
-				set(HEAD_BRANCH "")
-			endif()
+				configure_file ( "${GIT_DIR}/HEAD" "${GIT_DATA}/head-ref" COPYONLY )
+				set ( HEAD_BRANCH "" )
+			endif ()
 
-			if(NOT HEAD_HASH)
-				file(READ "${GIT_DATA}/head-ref" HEAD_HASH LIMIT 1024)
-				string(STRIP "${HEAD_HASH}" HEAD_HASH)
-			endif()
+			if ( NOT HEAD_HASH )
+				file ( READ "${GIT_DATA}/head-ref" HEAD_HASH LIMIT 1024 )
+				string ( STRIP "${HEAD_HASH}" HEAD_HASH )
+			endif ()
 
-			if (HEAD_HASH)
-				string(SUBSTRING "${HEAD_HASH}" 0 7 HEAD_HASH)
-			endif (HEAD_HASH)
-		endif (EXISTS "${GIT_DIR}/HEAD")
-	endif(GIT_FOUND)
-endif()
+			if ( HEAD_HASH )
+				string ( SUBSTRING "${HEAD_HASH}" 0 7 HEAD_HASH )
+			endif ( HEAD_HASH )
+		endif ( EXISTS "${GIT_DIR}/HEAD" )
+	endif ( GIT_FOUND )
+endif ()
 
 # git pass gave nothing. Try, if it is an svn
-if (NOT HEAD_HASH)
-	if (EXISTS "${SOURCE_DIR}/.svn")
-		find_package(Subversion)
-		if (SUBVERSION_FOUND)
-			message (STATUS "Using svn working copy to provide branch and tag data")
-			Subversion_WC_INFO(${SOURCE_DIR} MY)
-			set (HEAD_HASH "${MY_WC_REVISION}")
-			get_filename_component(HEAD_BRANCH ${MY_WC_URL} NAME)
-		endif (SUBVERSION_FOUND)
-	endif()
-endif (NOT HEAD_HASH)
+if ( NOT HEAD_HASH )
+	if ( EXISTS "${SOURCE_DIR}/.svn" )
+		find_package ( Subversion )
+		if ( SUBVERSION_FOUND )
+			message ( STATUS "Using svn working copy to provide branch and tag data" )
+			Subversion_WC_INFO ( ${SOURCE_DIR} MY )
+			set ( HEAD_HASH "${MY_WC_REVISION}" )
+			get_filename_component ( HEAD_BRANCH ${MY_WC_URL} NAME )
+		endif ( SUBVERSION_FOUND )
+	endif ()
+endif ( NOT HEAD_HASH )
 
 # still nothing. Use the last chance - extract version from ID in the sources/headers
-if (NOT HEAD_HASH)
-	if (EXISTS "${SOURCE_DIR}/src/sphinxversion.h")
-		configure_file ("${SOURCE_DIR}/src/sphinxversion.h" "${BINARY_DIR}/config/gen_sphinxversion.h" @ONLY)
-	else()
-		message (SEND_ERROR "The sources are not svn repo or git clone, neither contain pre-created sphinxversion.h header. Please, put this file to your src/ folder manually")
-	endif()
-else()
-	message (STATUS "Branch is ${HEAD_BRANCH}, hash is ${HEAD_HASH}")
-	if (HEAD_BRANCH)
-		set (HEAD_TAGREV "${HEAD_BRANCH}_${HEAD_HASH}")
-	else (HEAD_BRANCH)
-		set (HEAD_TAGREV "${HEAD_HASH}")
-	endif (HEAD_BRANCH)
+if ( NOT HEAD_HASH )
+	if ( EXISTS "${SOURCE_DIR}/src/sphinxversion.h" )
+		configure_file ( "${SOURCE_DIR}/src/sphinxversion.h" "${BINARY_DIR}/config/gen_sphinxversion.h" @ONLY )
+	else ()
+		message ( SEND_ERROR "The sources are not svn repo or git clone, neither contain pre-created sphinxversion.h header. Please, put this file to your src/ folder manually" )
+	endif ()
+else ()
+	message ( STATUS "Branch is ${HEAD_BRANCH}, hash is ${HEAD_HASH}" )
+	if ( HEAD_BRANCH )
+		set ( HEAD_TAGREV "${HEAD_BRANCH}_${HEAD_HASH}" )
+	else ( HEAD_BRANCH )
+		set ( HEAD_TAGREV "${HEAD_HASH}" )
+	endif ( HEAD_BRANCH )
 
-	if (SPHINX_TAG)
-		set (HEAD_BRANCH "${HEAD_BRANCH}, tag ${SPHINX_TAG}")
-		set (HEAD_TAGREV "${HEAD_TAGREV}, tag ${SPHINX_TAG}")
-	endif (SPHINX_TAG)
+	if ( SPHINX_TAG )
+		set ( HEAD_BRANCH "${HEAD_BRANCH}, tag ${SPHINX_TAG}" )
+		set ( HEAD_TAGREV "${HEAD_TAGREV}, tag ${SPHINX_TAG}" )
+	endif ( SPHINX_TAG )
 
-	file (WRITE ${BINARY_DIR}/config/sphinxversion.h.txt
+	file ( WRITE ${BINARY_DIR}/config/sphinxversion.h.txt
 			"#define SPH_SVN_TAG \"@HEAD_BRANCH@\"\n
 			#define SPH_SVN_REV @HEAD_HASH@\n
 			#define SPH_SVN_REVSTR \"@HEAD_HASH@\"\n
 			#define SPH_GIT_COMMIT_ID \"@HEAD_HASH@\"\n
-			#define SPH_SVN_TAGREV \"@HEAD_TAGREV@\"\n")
+			#define SPH_SVN_TAGREV \"@HEAD_TAGREV@\"\n" )
 
-	configure_file ("${BINARY_DIR}/config/sphinxversion.h.txt" "${BINARY_DIR}/config/gen_sphinxversion.h" @ONLY)
-endif (NOT HEAD_HASH)
+	configure_file ( "${BINARY_DIR}/config/sphinxversion.h.txt" "${BINARY_DIR}/config/gen_sphinxversion.h" @ONLY )
+endif ( NOT HEAD_HASH )
 
 
 

src/CMakeLists.txt

@@ -1,19 +1,19 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required ( VERSION 2.8 )
 
 # main bunch of sources (for libsphinx)
-set (LIBSPHINX_SRCS sphinx.cpp sphinxexcerpt.cpp
+set ( LIBSPHINX_SRCS sphinx.cpp sphinxexcerpt.cpp
 		sphinxquery.cpp sphinxsoundex.cpp sphinxmetaphone.cpp
 		sphinxstemen.cpp sphinxstemru.cpp sphinxstemcz.cpp
 		sphinxstemar.cpp sphinxutils.cpp sphinxstd.cpp
 		sphinxsort.cpp sphinxexpr.cpp sphinxfilter.cpp
 		sphinxsearch.cpp sphinxrt.cpp sphinxjson.cpp
 		sphinxaot.cpp sphinxplugin.cpp sphinxudf.c
-		sphinxqcache.cpp sphinxrlp.cpp)
-set (INDEXER_SRCS indexer.cpp)
-set (INDEXTOOL_SRCS indextool.cpp)
-set (SEARCHD_SRCS searchd.cpp searchdha.cpp http/http_parser.c searchdhttp.cpp)
-set (SPELLDUMP_SRCS spelldump.cpp)
-set (TESTS_SRCS tests.cpp)
+		sphinxqcache.cpp sphinxrlp.cpp )
+set ( INDEXER_SRCS indexer.cpp )
+set ( INDEXTOOL_SRCS indextool.cpp )
+set ( SEARCHD_SRCS searchd.cpp searchdha.cpp http/http_parser.c searchdhttp.cpp )
+set ( SPELLDUMP_SRCS spelldump.cpp )
+set ( TESTS_SRCS tests.cpp )
 set ( LIBSPHINX_BISON sphinxexpr.y sphinxselect.y sphinxquery.y sphinxjson.y )
 set ( LIBSPHINX_FLEX sphinxjson.l )
 set ( SEARCHD_BISON sphinxql.y )
@@ -21,11 +21,11 @@ set ( SEARCHD_FLEX sphinxql.l )
 
 # The headers is not neccessary for executable build, but nesessary for MSVC and other projects
 # all the (non-generated) headers
-file (GLOB HEADERS "sphinx*.h" lz4.h lz4hc.h http/http_parser.h)
-file (GLOB SEARCHD_H "searchd*.h" )
+file ( GLOB HEADERS "sphinx*.h" lz4.h lz4hc.h http/http_parser.h )
+file ( GLOB SEARCHD_H "searchd*.h" )
 
-file (GLOB GHEADERS "yysphinx*.h")
-source_group ("Generated Header Files" FILES ${GHEADERS})
+file ( GLOB GHEADERS "yysphinx*.h" )
+source_group ( "Generated Header Files" FILES ${GHEADERS} )
 source_group ( "Grammar sources" FILES ${LIBSPHINX_BISON} ${SEARCHD_BISON} )
 source_group ( "Lexer sources" FILES ${LIBSPHINX_FLEX} ${SEARCHD_FLEX} )
 
@@ -38,48 +38,48 @@ add_custom_target (
 		-D SPHINX_TAG="${SPHINX_TAG}"
 		-P ${CMAKE_SOURCE_DIR}/sphinxrev.cmake
 )
-include_directories ("${SPHINXSEARCH_BINARY_DIR}/config")
-add_definitions ("-DBUILD_WITH_CMAKE")
+include_directories ( "${SPHINXSEARCH_BINARY_DIR}/config" )
+add_definitions ( "-DBUILD_WITH_CMAKE" )
 
 #message (STATUS "Extra libraries:${EXTRA_LIBRARIES}")
 
 # add the extra targets in the case we want on-the-fly grammar compiler
-if (USE_BISON)
+if ( USE_BISON )
 
-	set (BISON_DIR "${SPHINXSEARCH_BINARY_DIR}/config")
+	set ( BISON_DIR "${SPHINXSEARCH_BINARY_DIR}/config" )
 
-	BISON_TARGET (ExprParser "${CMAKE_CURRENT_SOURCE_DIR}/sphinxexpr.y" ${BISON_DIR}/bissphinxexpr.c)
-	BISON_TARGET (SelectParser "${CMAKE_CURRENT_SOURCE_DIR}/sphinxselect.y" ${BISON_DIR}/bissphinxselect.c)
-	BISON_TARGET (QueryParser "${CMAKE_CURRENT_SOURCE_DIR}/sphinxquery.y" ${BISON_DIR}/bissphinxquery.c)
-	BISON_TARGET (SQLParser "${CMAKE_CURRENT_SOURCE_DIR}/sphinxql.y" ${BISON_DIR}/bissphinxql.c)
-	BISON_TARGET (JsonParser "${CMAKE_CURRENT_SOURCE_DIR}/sphinxjson.y" ${BISON_DIR}/bissphinxjson.c)
+	BISON_TARGET ( ExprParser "${CMAKE_CURRENT_SOURCE_DIR}/sphinxexpr.y" ${BISON_DIR}/bissphinxexpr.c )
+	BISON_TARGET ( SelectParser "${CMAKE_CURRENT_SOURCE_DIR}/sphinxselect.y" ${BISON_DIR}/bissphinxselect.c )
+	BISON_TARGET ( QueryParser "${CMAKE_CURRENT_SOURCE_DIR}/sphinxquery.y" ${BISON_DIR}/bissphinxquery.c )
+	BISON_TARGET ( SQLParser "${CMAKE_CURRENT_SOURCE_DIR}/sphinxql.y" ${BISON_DIR}/bissphinxql.c )
+	BISON_TARGET ( JsonParser "${CMAKE_CURRENT_SOURCE_DIR}/sphinxjson.y" ${BISON_DIR}/bissphinxjson.c )
 
-	set_property (SOURCE sphinxexpr.cpp APPEND PROPERTY
-			OBJECT_DEPENDS ${BISON_ExprParser_OUTPUT_SOURCE})
-	set_property (SOURCE sphinx.cpp APPEND PROPERTY
-			OBJECT_DEPENDS ${BISON_SelectParser_OUTPUT_SOURCE})
-	set_property (SOURCE sphinxquery.cpp APPEND PROPERTY
-			OBJECT_DEPENDS ${BISON_QueryParser_OUTPUT_SOURCE})
-	set_property (SOURCE searchd.cpp APPEND PROPERTY
-			OBJECT_DEPENDS ${BISON_SQLParser_OUTPUT_SOURCE})
-	set_property (SOURCE sphinxjson.cpp APPEND PROPERTY
-			OBJECT_DEPENDS ${BISON_JsonParser_OUTPUT_SOURCE})
+	set_property ( SOURCE sphinxexpr.cpp APPEND PROPERTY
+			OBJECT_DEPENDS ${BISON_ExprParser_OUTPUT_SOURCE} )
+	set_property ( SOURCE sphinx.cpp APPEND PROPERTY
+			OBJECT_DEPENDS ${BISON_SelectParser_OUTPUT_SOURCE} )
+	set_property ( SOURCE sphinxquery.cpp APPEND PROPERTY
+			OBJECT_DEPENDS ${BISON_QueryParser_OUTPUT_SOURCE} )
+	set_property ( SOURCE searchd.cpp APPEND PROPERTY
+			OBJECT_DEPENDS ${BISON_SQLParser_OUTPUT_SOURCE} )
+	set_property ( SOURCE sphinxjson.cpp APPEND PROPERTY
+			OBJECT_DEPENDS ${BISON_JsonParser_OUTPUT_SOURCE} )
 
-endif (USE_BISON)
+endif ( USE_BISON )
 
 # add the extra targets in the case we want on-the-fly lex compiler
-if (USE_FLEX)
-	set (FLEX_DIR "${SPHINXSEARCH_BINARY_DIR}/config")
+if ( USE_FLEX )
+	set ( FLEX_DIR "${SPHINXSEARCH_BINARY_DIR}/config" )
 
-	FLEX_TARGET (SQLlex "${CMAKE_CURRENT_SOURCE_DIR}/sphinxql.l" ${FLEX_DIR}/flexsphinxql.c COMPILE_FLAGS "-i")
-	FLEX_TARGET (Jsonlex "${CMAKE_CURRENT_SOURCE_DIR}/sphinxjson.l" ${FLEX_DIR}/flexsphinxjson.c COMPILE_FLAGS "-i -Pyy2")
+	FLEX_TARGET ( SQLlex "${CMAKE_CURRENT_SOURCE_DIR}/sphinxql.l" ${FLEX_DIR}/flexsphinxql.c COMPILE_FLAGS "-i" )
+	FLEX_TARGET ( Jsonlex "${CMAKE_CURRENT_SOURCE_DIR}/sphinxjson.l" ${FLEX_DIR}/flexsphinxjson.c COMPILE_FLAGS "-i -Pyy2" )
 
-	set_property (SOURCE searchd.cpp APPEND PROPERTY
-			OBJECT_DEPENDS ${FLEX_SQLlex_OUTPUTS})
-	set_property (SOURCE sphinxjson.cpp APPEND PROPERTY
-			OBJECT_DEPENDS ${FLEX_Jsonlex_OUTPUTS})
+	set_property ( SOURCE searchd.cpp APPEND PROPERTY
+			OBJECT_DEPENDS ${FLEX_SQLlex_OUTPUTS} )
+	set_property ( SOURCE sphinxjson.cpp APPEND PROPERTY
+			OBJECT_DEPENDS ${FLEX_Jsonlex_OUTPUTS} )
 
-endif (USE_FLEX)
+endif ( USE_FLEX )
 
 # our mega-lib
 add_library ( libsphinx STATIC ${LIBSPHINX_SRCS} ${HEADERS} ${GHEADERS} ${LIBSPHINX_BISON} ${LIBSPHINX_FLEX} )
@@ -100,25 +100,25 @@ target_link_libraries ( spelldump libsphinx ${EXTRA_LIBRARIES} )
 target_link_libraries ( tests libsphinx ${EXTRA_LIBRARIES} )
 
 
-if (SPLIT_SYMBOLS)
-	include(helpers)
-	install_dbg (indexer)
-	install_dbg (indextool)
-	install_dbg (searchd)
-	install_dbg (spelldump)
-	install_dbg (tests)
-endif (SPLIT_SYMBOLS)
+if ( SPLIT_SYMBOLS )
+	include ( helpers )
+	install_dbg ( indexer )
+	install_dbg ( indextool )
+	install_dbg ( searchd )
+	install_dbg ( spelldump )
+	install_dbg ( tests )
+endif ( SPLIT_SYMBOLS )
 
-INSTALL (TARGETS indexer indextool searchd spelldump RUNTIME DESTINATION bin COMPONENT APPLICATIONS)
+INSTALL ( TARGETS indexer indextool searchd spelldump RUNTIME DESTINATION bin COMPONENT APPLICATIONS )
 
 # testrt is win-only project
-if (WIN32)
-	add_executable (testrt testrt.cpp)
-	target_link_libraries (testrt libsphinx ${EXTRA_LIBRARIES})
-endif (WIN32)
+if ( WIN32 )
+	add_executable ( testrt testrt.cpp )
+	target_link_libraries ( testrt libsphinx ${EXTRA_LIBRARIES} )
+endif ( WIN32 )
 
-add_test (NAME "\"Internal src/tests\""
+add_test ( NAME "\"Internal src/tests\""
 		#    	CONFIGURATIONS Debug
 		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-		COMMAND "tests")
+		COMMAND "tests" )
 

test/CMakeLists.txt

@@ -1,45 +1,45 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required ( VERSION 2.8 )
 
 # will add the tests from test suite
 # each test will be added as separate one
-file(GLOB tests "test_[0-9]*")
-list(SORT tests)
+file ( GLOB tests "test_[0-9]*" )
+list ( SORT tests )
 
-foreach(test ${tests})
+foreach ( test ${tests} )
 	# get the last dir (filename)
-	get_filename_component(onetest "${test}" NAME_WE)
+	get_filename_component ( onetest "${test}" NAME_WE )
 	# crop the 'test_' heading (so, only number is rest)
-	STRING(REGEX REPLACE "^test_" "" onetest "${onetest}")
+	STRING ( REGEX REPLACE "^test_" "" onetest "${onetest}" )
 
 	# check if we can extract the name for the test from it
-	if (EXISTS "${test}/test.xml")
+	if ( EXISTS "${test}/test.xml" )
 		# open the file with the test
-		file(READ ${test}/test.xml test_name LIMIT 1024)
+		file ( READ ${test}/test.xml test_name LIMIT 1024 )
 		# cut out all from the beginning to '<name>'
-		STRING(REGEX REPLACE "^.*<[Nn][Aa][Mm][Ee]>" "" test_name "${test_name}")
+		STRING ( REGEX REPLACE "^.*<[Nn][Aa][Mm][Ee]>" "" test_name "${test_name}" )
 		# cut out all from the </name> to the end
-    	STRING(REGEX REPLACE "</[Nn][Aa][Mm][Ee]>.*$" "" test_name "${test_name}")
-    else()
-    	set (test_name "")
-    endif()
+		STRING ( REGEX REPLACE "</[Nn][Aa][Mm][Ee]>.*$" "" test_name "${test_name}" )
+	else ()
+		set ( test_name "" )
+	endif ()
 
 	set ( tst_name "rt ubertest test_${onetest} ${test_name}" )
 	add_test ( NAME "\"${tst_name}\""
-#			CONFIGURATIONS "Debug"
+			#			CONFIGURATIONS "Debug"
 			WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
 			COMMAND php ubertest.php -s $<TARGET_FILE:searchd> -i $<TARGET_FILE:indexer> -u test --strict-verbose --no-demo --rt --ignore-weights t ${onetest} )
 	set_tests_properties ( "\"${tst_name}\"" PROPERTIES
 			PASS_REGULAR_EXPRESSION "ALL OK" FAIL_REGULAR_EXPRESSION "THERE WERE FAILURES" )
 
-	set ( tst_name "ubertest test_${onetest} ${test_name}")
-    add_test(NAME "\"${tst_name}\""
-#    	CONFIGURATIONS Debug
-		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    	COMMAND php ubertest.php -s $<TARGET_FILE:searchd> -i $<TARGET_FILE:indexer> -u test --strict-verbose --no-demo t ${onetest})
-	set_tests_properties ("\"${tst_name}\"" PROPERTIES
-			PASS_REGULAR_EXPRESSION "ALL OK" FAIL_REGULAR_EXPRESSION "THERE WERE FAILURES")
+	set ( tst_name "ubertest test_${onetest} ${test_name}" )
+	add_test ( NAME "\"${tst_name}\""
+			#    	CONFIGURATIONS Debug
+			WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+			COMMAND php ubertest.php -s $<TARGET_FILE:searchd> -i $<TARGET_FILE:indexer> -u test --strict-verbose --no-demo t ${onetest} )
+	set_tests_properties ( "\"${tst_name}\"" PROPERTIES
+			PASS_REGULAR_EXPRESSION "ALL OK" FAIL_REGULAR_EXPRESSION "THERE WERE FAILURES" )
 
-endforeach()
+endforeach ()