CMake: Apply editorconfig formatting

16 files changed, 310 insertions, 310 deletions

diff --git a/CMake/CCache.cmake b/CMake/CCache.cmake
index a8ee5da473..37ad51ee09 100644
--- a/CMake/CCache.cmake
+++ b/CMake/CCache.cmake
@@ -1,17 +1,17 @@
 find_program(CCACHE_BIN NAMES ccache sccache)
 if(CCACHE_BIN)
-    # Official ccache recommendation is to set CMAKE_C(XX)_COMPILER_LAUNCHER
-    if (NOT CMAKE_C_COMPILER_LAUNCHER MATCHES "ccache")
-        list(INSERT CMAKE_C_COMPILER_LAUNCHER 0 "${CCACHE_BIN}")
-    endif()
+  # Official ccache recommendation is to set CMAKE_C(XX)_COMPILER_LAUNCHER
+  if (NOT CMAKE_C_COMPILER_LAUNCHER MATCHES "ccache")
+    list(INSERT CMAKE_C_COMPILER_LAUNCHER 0 "${CCACHE_BIN}")
+  endif()
 
-    if (NOT CMAKE_CXX_COMPILER_LAUNCHER MATCHES "ccache")
-        list(INSERT CMAKE_CXX_COMPILER_LAUNCHER 0 "${CCACHE_BIN}")
-    endif()
+  if (NOT CMAKE_CXX_COMPILER_LAUNCHER MATCHES "ccache")
+    list(INSERT CMAKE_CXX_COMPILER_LAUNCHER 0 "${CCACHE_BIN}")
+  endif()
 
-    # ccache uses -I when compiling without preprocessor, which makes clang complain.
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments -fcolor-diagnostics")
-        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -fcolor-diagnostics")
-    endif()
+  # ccache uses -I when compiling without preprocessor, which makes clang complain.
+  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments -fcolor-diagnostics")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -fcolor-diagnostics")
+  endif()
 endif()
diff --git a/CMake/CheckLib.cmake b/CMake/CheckLib.cmake
index 64c05e9ba0..ba6b8bf0aa 100644
--- a/CMake/CheckLib.cmake
+++ b/CMake/CheckLib.cmake
@@ -1,58 +1,58 @@
 find_package(PkgConfig)
 
 macro(_internal_message msg)
-	if(NOT ${_is_quiet})
-		message(STATUS "${msg}")
-	endif()
+  if(NOT ${_is_quiet})
+    message(STATUS "${msg}")
+  endif()
 endmacro()
 
 macro(check_lib var pc lib)
-	set(_is_required 0)
-	set(_is_quiet 0)
-	set(_arg_list ${ARGN})
-	foreach(_arg ${ARGN})
-		if(_arg STREQUAL "REQUIRED")
-			list(REMOVE_ITEM _arg_list "REQUIRED")
-			set(_is_required 1)
-		endif()
-		if(_arg STREQUAL "QUIET")
-			list(REMOVE_ITEM _arg_list "QUIET")
-			set(_is_quiet 1)
-		endif()
-	endforeach()
+  set(_is_required 0)
+  set(_is_quiet 0)
+  set(_arg_list ${ARGN})
+  foreach(_arg ${ARGN})
+    if(_arg STREQUAL "REQUIRED")
+      list(REMOVE_ITEM _arg_list "REQUIRED")
+      set(_is_required 1)
+    endif()
+    if(_arg STREQUAL "QUIET")
+      list(REMOVE_ITEM _arg_list "QUIET")
+      set(_is_quiet 1)
+    endif()
+  endforeach()
 
-	if(PKG_CONFIG_FOUND AND NOT ${var}_FOUND)
-		pkg_search_module(${var} QUIET ${pc})
-	endif()
+  if(PKG_CONFIG_FOUND AND NOT ${var}_FOUND)
+    pkg_search_module(${var} QUIET ${pc})
+  endif()
 
-	if(${var}_FOUND)
-		if(${var}_INCLUDE_DIRS)
-			include_directories(${${var}_INCLUDE_DIRS})
-		endif()
-		# Make sure include directories for headers found using find_path below
-		# are re-added when reconfiguring
-		if(${var}_INCLUDE)
-			include_directories(${${var}_INCLUDE})
-		endif()
-		_internal_message("${lib} found")
-	else()
-		find_library(${var} ${lib})
-		if(_arg_list)
-			find_path(${var}_INCLUDE ${_arg_list})
-		else()
-			set(${var}_INCLUDE FALSE)
-		endif()
-		if(${var} AND ${var}_INCLUDE)
-			include_directories(${${var}_INCLUDE})
-			_internal_message("${lib} found")
-			set(${var}_FOUND 1 CACHE INTERNAL "")
-		else()
-			if(_is_required)
-				message(FATAL_ERROR "${lib} is required but not found")
-			else()
-				_internal_message("${lib} not found")
-			endif()
-		endif()
-	endif()
+  if(${var}_FOUND)
+    if(${var}_INCLUDE_DIRS)
+      include_directories(${${var}_INCLUDE_DIRS})
+    endif()
+    # Make sure include directories for headers found using find_path below
+    # are re-added when reconfiguring
+    if(${var}_INCLUDE)
+      include_directories(${${var}_INCLUDE})
+    endif()
+    _internal_message("${lib} found")
+  else()
+    find_library(${var} ${lib})
+    if(_arg_list)
+      find_path(${var}_INCLUDE ${_arg_list})
+    else()
+      set(${var}_INCLUDE FALSE)
+    endif()
+    if(${var} AND ${var}_INCLUDE)
+      include_directories(${${var}_INCLUDE})
+      _internal_message("${lib} found")
+      set(${var}_FOUND 1 CACHE INTERNAL "")
+    else()
+      if(_is_required)
+        message(FATAL_ERROR "${lib} is required but not found")
+      else()
+        _internal_message("${lib} not found")
+      endif()
+    endif()
+  endif()
 endmacro()
 
diff --git a/CMake/DolphinPostprocessBundle.cmake b/CMake/DolphinPostprocessBundle.cmake
index 4a1c68562c..83cee8c971 100644
--- a/CMake/DolphinPostprocessBundle.cmake
+++ b/CMake/DolphinPostprocessBundle.cmake
@@ -10,15 +10,15 @@
 # module as a post-build step.
 
 if(CMAKE_GENERATOR)
-	# Being called as include(DolphinPostprocessBundle), so define a helper function.
-	set(_DOLPHIN_POSTPROCESS_BUNDLE_MODULE_LOCATION "${CMAKE_CURRENT_LIST_FILE}")
-	function(dolphin_postprocess_bundle target)
-		add_custom_command(TARGET ${target} POST_BUILD
-			COMMAND ${CMAKE_COMMAND} "-D" "DOLPHIN_BUNDLE_PATH=$<TARGET_BUNDLE_DIR:${target}>"
-				-P "${_DOLPHIN_POSTPROCESS_BUNDLE_MODULE_LOCATION}"
-		)
-	endfunction()
-	return()
+  # Being called as include(DolphinPostprocessBundle), so define a helper function.
+  set(_DOLPHIN_POSTPROCESS_BUNDLE_MODULE_LOCATION "${CMAKE_CURRENT_LIST_FILE}")
+  function(dolphin_postprocess_bundle target)
+    add_custom_command(TARGET ${target} POST_BUILD
+      COMMAND ${CMAKE_COMMAND} "-D" "DOLPHIN_BUNDLE_PATH=$<TARGET_BUNDLE_DIR:${target}>"
+        -P "${_DOLPHIN_POSTPROCESS_BUNDLE_MODULE_LOCATION}"
+    )
+  endfunction()
+  return()
 endif()
 
 message(STATUS "Fixing up application bundle: ${DOLPHIN_BUNDLE_PATH}")
@@ -35,9 +35,9 @@ set(extra_dirs "/usr/local/lib" "/lib" "/usr/lib")
 
 # BundleUtilities is overly verbose, so disable most of its messages
 function(message)
-	if(NOT ARGV MATCHES "^STATUS;")
-		_message(${ARGV})
-	endif()
+  if(NOT ARGV MATCHES "^STATUS;")
+    _message(${ARGV})
+  endif()
 endfunction()
 
 include(BundleUtilities)
diff --git a/CMake/FindCUBEB.cmake b/CMake/FindCUBEB.cmake
index 94ed431a9b..3b9235c836 100644
--- a/CMake/FindCUBEB.cmake
+++ b/CMake/FindCUBEB.cmake
@@ -4,7 +4,7 @@ mark_as_advanced(CUBEB_INCLUDE_DIR CUBEB_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(CUBEB DEFAULT_MSG
-	CUBEB_INCLUDE_DIR CUBEB_LIBRARY)
+  CUBEB_INCLUDE_DIR CUBEB_LIBRARY)
 
 if(CUBEB_FOUND AND NOT TARGET cubeb::cubeb)
   add_library(cubeb::cubeb UNKNOWN IMPORTED)
diff --git a/CMake/FindEGL.cmake b/CMake/FindEGL.cmake
index dd7a8bcff0..43e4a1a9f5 100644
--- a/CMake/FindEGL.cmake
+++ b/CMake/FindEGL.cmake
@@ -36,16 +36,16 @@ find_package(PkgConfig)
 pkg_check_modules(PC_EGL egl)
 
 if (PC_EGL_FOUND)
-    set(EGL_DEFINITIONS ${PC_EGL_CFLAGS_OTHER})
+  set(EGL_DEFINITIONS ${PC_EGL_CFLAGS_OTHER})
 endif ()
 
 find_path(EGL_INCLUDE_DIRS NAMES EGL/egl.h
-    HINTS ${PC_EGL_INCLUDEDIR} ${PC_EGL_INCLUDE_DIRS}
+  HINTS ${PC_EGL_INCLUDEDIR} ${PC_EGL_INCLUDE_DIRS}
 )
 
 set(EGL_NAMES ${EGL_NAMES} egl EGL)
 find_library(EGL_LIBRARIES NAMES ${EGL_NAMES}
-    HINTS ${PC_EGL_LIBDIR} ${PC_EGL_LIBRARY_DIRS}
+  HINTS ${PC_EGL_LIBDIR} ${PC_EGL_LIBRARY_DIRS}
 )
 
 include(FindPackageHandleStandardArgs)
diff --git a/CMake/FindHIDAPI.cmake b/CMake/FindHIDAPI.cmake
index 81b9990212..422a894902 100644
--- a/CMake/FindHIDAPI.cmake
+++ b/CMake/FindHIDAPI.cmake
@@ -7,11 +7,11 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(HIDAPI DEFAULT_MSG HIDAPI_LIBRARY HIDAPI_INCLUDE_DIR)
 
 if(HIDAPI_FOUND AND NOT TARGET Hidapi::Hidapi)
-    add_library(Hidapi::Hidapi UNKNOWN IMPORTED)
-    set_target_properties(Hidapi::Hidapi PROPERTIES
-      IMPORTED_LOCATION ${HIDAPI_LIBRARIES}
-      INTERFACE_INCLUDE_DIRECTORIES ${HIDAPI_INCLUDE_DIRS}
-    )
+  add_library(Hidapi::Hidapi UNKNOWN IMPORTED)
+  set_target_properties(Hidapi::Hidapi PROPERTIES
+    IMPORTED_LOCATION ${HIDAPI_LIBRARIES}
+    INTERFACE_INCLUDE_DIRECTORIES ${HIDAPI_INCLUDE_DIRS}
+  )
 endif()
 
 mark_as_advanced(HIDAPI_INCLUDE_DIR HIDAPI_LIBRARY)
diff --git a/CMake/FindLIBEVDEV.cmake b/CMake/FindLIBEVDEV.cmake
index f01e41a562..3edfbca188 100644
--- a/CMake/FindLIBEVDEV.cmake
+++ b/CMake/FindLIBEVDEV.cmake
@@ -8,19 +8,19 @@ find_package(PkgConfig)
 pkg_check_modules(PC_LIBEVDEV QUIET libevdev)
 
 FIND_PATH(
-    LIBEVDEV_INCLUDE_DIR libevdev/libevdev.h
-    HINTS ${PC_LIBEVDEV_INCLUDEDIR} ${PC_LIBEVDEV_INCLUDE_DIRS}
-    /usr/include
-    /usr/local/include
-    ${LIBEVDEV_PATH_INCLUDES}
+  LIBEVDEV_INCLUDE_DIR libevdev/libevdev.h
+  HINTS ${PC_LIBEVDEV_INCLUDEDIR} ${PC_LIBEVDEV_INCLUDE_DIRS}
+  /usr/include
+  /usr/local/include
+  ${LIBEVDEV_PATH_INCLUDES}
 )
 
 FIND_LIBRARY(
-    LIBEVDEV_LIBRARY
-    NAMES evdev libevdev
-    HINTS ${PC_LIBEVDEV_LIBDIR} ${PC_LIBEVDEV_LIBRARY_DIRS}
-    PATHS ${ADDITIONAL_LIBRARY_PATHS}
-        ${LIBEVDEV_PATH_LIB}
+  LIBEVDEV_LIBRARY
+  NAMES evdev libevdev
+  HINTS ${PC_LIBEVDEV_LIBDIR} ${PC_LIBEVDEV_LIBRARY_DIRS}
+  PATHS ${ADDITIONAL_LIBRARY_PATHS}
+    ${LIBEVDEV_PATH_LIB}
 )
 
 set(LIBEVDEV_LIBRARIES ${LIBEVDEV_LIBRARY} )
diff --git a/CMake/FindLIBMGBA.cmake b/CMake/FindLIBMGBA.cmake
index 7772c4097b..ab56c85aa7 100644
--- a/CMake/FindLIBMGBA.cmake
+++ b/CMake/FindLIBMGBA.cmake
@@ -4,7 +4,7 @@ mark_as_advanced(LIBMGBA_INCLUDE_DIR LIBMGBA_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LIBMGBA DEFAULT_MSG
-	LIBMGBA_INCLUDE_DIR LIBMGBA_LIBRARY)
+  LIBMGBA_INCLUDE_DIR LIBMGBA_LIBRARY)
 
 if(LIBMGBA_FOUND AND NOT mGBA::mgba)
   add_library(mGBA::mgba UNKNOWN IMPORTED)
diff --git a/CMake/FindLIBUDEV.cmake b/CMake/FindLIBUDEV.cmake
index 2b71e4e605..aa4aba04e3 100644
--- a/CMake/FindLIBUDEV.cmake
+++ b/CMake/FindLIBUDEV.cmake
@@ -5,17 +5,17 @@
 #  LIBUDEV_LIBRARIES - The libraries needed to use LIBUDEV
 
 FIND_PATH(
-    LIBUDEV_INCLUDE_DIR libudev.h
-    /usr/include
-    /usr/local/include
-    ${LIBUDEV_PATH_INCLUDES}
+  LIBUDEV_INCLUDE_DIR libudev.h
+  /usr/include
+  /usr/local/include
+  ${LIBUDEV_PATH_INCLUDES}
 )
 
 FIND_LIBRARY(
-    LIBUDEV_LIBRARY
-    NAMES udev libudev
-    PATHS ${ADDITIONAL_LIBRARY_PATHS}
-        ${LIBUDEV_PATH_LIB}
+  LIBUDEV_LIBRARY
+  NAMES udev libudev
+  PATHS ${ADDITIONAL_LIBRARY_PATHS}
+    ${LIBUDEV_PATH_LIB}
 )
 
 set(LIBUDEV_LIBRARIES ${LIBUDEV_LIBRARY} )
diff --git a/CMake/FindLZO.cmake b/CMake/FindLZO.cmake
index 2a146b37c8..c7e08c6bf3 100644
--- a/CMake/FindLZO.cmake
+++ b/CMake/FindLZO.cmake
@@ -4,7 +4,7 @@ mark_as_advanced(LZO_INCLUDE_DIR LZO_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LZO DEFAULT_MSG
-	LZO_INCLUDE_DIR LZO_LIBRARY)
+  LZO_INCLUDE_DIR LZO_LIBRARY)
 
 if(LZO_FOUND AND NOT TARGET LZO::LZO)
   add_library(LZO::LZO UNKNOWN IMPORTED)
diff --git a/CMake/FindLibUSB.cmake b/CMake/FindLibUSB.cmake
index c087edfcb8..5a6fc7197f 100644
--- a/CMake/FindLibUSB.cmake
+++ b/CMake/FindLibUSB.cmake
@@ -9,42 +9,42 @@
 # vim: expandtab sw=4 ts=4 sts=4:
 
 if(ANDROID)
-       set(LIBUSB_FOUND FALSE CACHE INTERNAL "libusb-1.0 found")
-       message(STATUS "libusb-1.0 not found.")
+  set(LIBUSB_FOUND FALSE CACHE INTERNAL "libusb-1.0 found")
+  message(STATUS "libusb-1.0 not found.")
 elseif (NOT LIBUSB_FOUND)
-    pkg_check_modules (LIBUSB_PKG libusb-1.0)
+  pkg_check_modules (LIBUSB_PKG libusb-1.0)
 
-    find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h
-       PATHS
-       ${LIBUSB_PKG_INCLUDE_DIRS}
-       /usr/include/libusb-1.0
-       /usr/include
-       /usr/local/include/libusb-1.0
-       /usr/local/include
-    )
+  find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h
+    PATHS
+    ${LIBUSB_PKG_INCLUDE_DIRS}
+    /usr/include/libusb-1.0
+    /usr/include
+    /usr/local/include/libusb-1.0
+    /usr/local/include
+  )
 
-    find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb
-       PATHS
-       ${LIBUSB_PKG_LIBRARY_DIRS}
-       /usr/lib
-       /usr/local/lib
-    )
+  find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb
+    PATHS
+    ${LIBUSB_PKG_LIBRARY_DIRS}
+    /usr/lib
+    /usr/local/lib
+  )
 
-    if(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
-       set(LIBUSB_FOUND TRUE CACHE INTERNAL "libusb-1.0 found")
-       message(STATUS "Found libusb-1.0: ${LIBUSB_INCLUDE_DIR}, ${LIBUSB_LIBRARIES}")
-    else(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
-       set(LIBUSB_FOUND FALSE CACHE INTERNAL "libusb-1.0 found")
-       message(STATUS "libusb-1.0 not found.")
-    endif(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+  if(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+    set(LIBUSB_FOUND TRUE CACHE INTERNAL "libusb-1.0 found")
+    message(STATUS "Found libusb-1.0: ${LIBUSB_INCLUDE_DIR}, ${LIBUSB_LIBRARIES}")
+  else(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+    set(LIBUSB_FOUND FALSE CACHE INTERNAL "libusb-1.0 found")
+    message(STATUS "libusb-1.0 not found.")
+  endif(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
 
-    mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES)
+  mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES)
 endif ()
 if(LIBUSB_FOUND AND NOT TARGET LibUSB::LibUSB)
-    add_library(LibUSB::LibUSB UNKNOWN IMPORTED)
-    set_target_properties(LibUSB::LibUSB PROPERTIES
-        IMPORTED_LOCATION "${LIBUSB_LIBRARIES}"
-        INTERFACE_INCLUDE_DIRECTORIES "${LIBUSB_INCLUDE_DIR}"
-    )
+  add_library(LibUSB::LibUSB UNKNOWN IMPORTED)
+  set_target_properties(LibUSB::LibUSB PROPERTIES
+    IMPORTED_LOCATION "${LIBUSB_LIBRARIES}"
+    INTERFACE_INCLUDE_DIRECTORIES "${LIBUSB_INCLUDE_DIR}"
+  )
 endif()
 
diff --git a/CMake/FindMBEDTLS.cmake b/CMake/FindMBEDTLS.cmake
index 6512cc92f6..0438c2449e 100644
--- a/CMake/FindMBEDTLS.cmake
+++ b/CMake/FindMBEDTLS.cmake
@@ -8,52 +8,52 @@ set(MBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
 set(MBEDTLS_LIBRARIES ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
 
 if(NOT MBEDTLS_INCLUDE_DIR STREQUAL "MBEDTLS_INCLUDE_DIR-NOTFOUND")
-	if(EXISTS ${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h)
-	    file(STRINGS ${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h MBEDTLS_VERSION_STR REGEX "^#define[ \t]+MBEDTLS_VERSION_STRING[\t ].*")
-	else()
-	    file(STRINGS ${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h MBEDTLS_VERSION_STR REGEX "^#define[ \t]+MBEDTLS_VERSION_STRING[\t ].*")
-	endif()
-	string(REGEX REPLACE "^#define[\t ]+MBEDTLS_VERSION_STRING[\t ]+\"([.0-9]+)\".*" "\\1" MBEDTLS_VERSION ${MBEDTLS_VERSION_STR})
+  if(EXISTS ${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h)
+    file(STRINGS ${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h MBEDTLS_VERSION_STR REGEX "^#define[ \t]+MBEDTLS_VERSION_STRING[\t ].*")
+  else()
+    file(STRINGS ${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h MBEDTLS_VERSION_STR REGEX "^#define[ \t]+MBEDTLS_VERSION_STRING[\t ].*")
+  endif()
+  string(REGEX REPLACE "^#define[\t ]+MBEDTLS_VERSION_STRING[\t ]+\"([.0-9]+)\".*" "\\1" MBEDTLS_VERSION ${MBEDTLS_VERSION_STR})
 endif()
 
 if(NOT MBEDTLS_INCLUDE_DIR STREQUAL "MBEDTLS_INCLUDE_DIR-NOTFOUND" AND MBEDTLS_VERSION VERSION_GREATER_EQUAL 3)
-	# Once CMake 3.19 is required, we can enable HANDLE_VERSION_RANGE and use that
-	if(MBEDTLS_FIND_REQUIRED)
-		set(type FATAL_ERROR)
-	else()
-		set(type STATUS)
-	endif()
-	if(MBEDTLS_FIND_REQUIRED OR NOT MBEDTLS_FIND_QUIETLY)
-		message(${type} "Could NOT find MBEDTLS: Found unsuitable version \"${MBEDTLS_VERSION}\", but a 2.x version is required (found ${MBEDTLS_INCLUDE_DIR})")
-	endif()
-	set(MBEDTLS_FOUND FALSE)
+  # Once CMake 3.19 is required, we can enable HANDLE_VERSION_RANGE and use that
+  if(MBEDTLS_FIND_REQUIRED)
+    set(type FATAL_ERROR)
+  else()
+    set(type STATUS)
+  endif()
+  if(MBEDTLS_FIND_REQUIRED OR NOT MBEDTLS_FIND_QUIETLY)
+    message(${type} "Could NOT find MBEDTLS: Found unsuitable version \"${MBEDTLS_VERSION}\", but a 2.x version is required (found ${MBEDTLS_INCLUDE_DIR})")
+  endif()
+  set(MBEDTLS_FOUND FALSE)
 else()
-	include(FindPackageHandleStandardArgs)
-	find_package_handle_standard_args(MBEDTLS
-		REQUIRED_VARS MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY
-		VERSION_VAR MBEDTLS_VERSION)
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(MBEDTLS
+    REQUIRED_VARS MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY
+    VERSION_VAR MBEDTLS_VERSION)
 endif()
 
 mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY)
 
 if(MBEDTLS_FOUND)
-	add_library(MbedTLS::mbedcrypto UNKNOWN IMPORTED)
-	set_target_properties(MbedTLS::mbedcrypto PROPERTIES
-	    IMPORTED_LOCATION "${MBEDCRYPTO_LIBRARY}"
-	    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
-	)
-
-	add_library(MbedTLS::mbedx509 UNKNOWN IMPORTED)
-	set_target_properties(MbedTLS::mbedx509 PROPERTIES
-	    IMPORTED_LOCATION "${MBEDX509_LIBRARY}"
-	    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
-	    INTERFACE_LINK_LIBRARIES MbedTLS::mbedcrypto
-	)
-
-	add_library(MbedTLS::mbedtls UNKNOWN IMPORTED)
-	set_target_properties(MbedTLS::mbedtls PROPERTIES
-	    IMPORTED_LOCATION "${MBEDTLS_LIBRARY}"
-	    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
-	    INTERFACE_LINK_LIBRARIES MbedTLS::mbedx509
-	)
+  add_library(MbedTLS::mbedcrypto UNKNOWN IMPORTED)
+  set_target_properties(MbedTLS::mbedcrypto PROPERTIES
+    IMPORTED_LOCATION "${MBEDCRYPTO_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
+  )
+
+  add_library(MbedTLS::mbedx509 UNKNOWN IMPORTED)
+  set_target_properties(MbedTLS::mbedx509 PROPERTIES
+    IMPORTED_LOCATION "${MBEDX509_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
+    INTERFACE_LINK_LIBRARIES MbedTLS::mbedcrypto
+  )
+
+  add_library(MbedTLS::mbedtls UNKNOWN IMPORTED)
+  set_target_properties(MbedTLS::mbedtls PROPERTIES
+    IMPORTED_LOCATION "${MBEDTLS_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
+    INTERFACE_LINK_LIBRARIES MbedTLS::mbedx509
+  )
 endif()
diff --git a/CMake/FindMINIUPNPC.cmake b/CMake/FindMINIUPNPC.cmake
index edfc5b2b9d..72c2dd0c6e 100644
--- a/CMake/FindMINIUPNPC.cmake
+++ b/CMake/FindMINIUPNPC.cmake
@@ -5,16 +5,16 @@ find_path(MINIUPNPC_INCLUDE_DIR miniupnpc.h PATH_SUFFIXES miniupnpc)
 find_library(MINIUPNPC_LIBRARY miniupnpc)
 
 if(MINIUPNPC_INCLUDE_DIR)
-	file(STRINGS "${MINIUPNPC_INCLUDE_DIR}/miniupnpc.h" MINIUPNPC_VERSION_STR REGEX "^#define[\t ]+MINIUPNPC_VERSION[\t ]+.*")
-	if(MINIUPNPC_VERSION_STR)
-		string(REGEX REPLACE "^#define[\t ]+MINIUPNPC_VERSION[\t ]+\"([.0-9]+)\"" "\\1" MINIUPNPC_VERSION ${MINIUPNPC_VERSION_STR})
-	endif()
+  file(STRINGS "${MINIUPNPC_INCLUDE_DIR}/miniupnpc.h" MINIUPNPC_VERSION_STR REGEX "^#define[\t ]+MINIUPNPC_VERSION[\t ]+.*")
+  if(MINIUPNPC_VERSION_STR)
+    string(REGEX REPLACE "^#define[\t ]+MINIUPNPC_VERSION[\t ]+\"([.0-9]+)\"" "\\1" MINIUPNPC_VERSION ${MINIUPNPC_VERSION_STR})
+  endif()
 endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(MINIUPNPC
-	REQUIRED_VARS MINIUPNPC_INCLUDE_DIR MINIUPNPC_LIBRARY
-	VERSION_VAR MINIUPNPC_VERSION
+  REQUIRED_VARS MINIUPNPC_INCLUDE_DIR MINIUPNPC_LIBRARY
+  VERSION_VAR MINIUPNPC_VERSION
 )
 
 set(MINIUPNPC_LIBRARIES ${MINIUPNPC_LIBRARY})
diff --git a/CMake/FindSFML.cmake b/CMake/FindSFML.cmake
index 79522c5b0f..ba2a92736b 100644
--- a/CMake/FindSFML.cmake
+++ b/CMake/FindSFML.cmake
@@ -52,13 +52,13 @@
 
 # define the SFML_STATIC macro if static build was chosen
 if(SFML_STATIC_LIBRARIES)
-    add_definitions(-DSFML_STATIC)
+  add_definitions(-DSFML_STATIC)
 endif()
 
 # deduce the libraries suffix from the options
 set(FIND_SFML_LIB_SUFFIX "")
 if(SFML_STATIC_LIBRARIES)
-    set(FIND_SFML_LIB_SUFFIX "${FIND_SFML_LIB_SUFFIX}-s")
+  set(FIND_SFML_LIB_SUFFIX "${FIND_SFML_LIB_SUFFIX}-s")
 endif()
 
 # find the SFML include directory
@@ -79,41 +79,41 @@ find_path(SFML_INCLUDE_DIR SFML/Config.hpp
 # check the version number
 set(SFML_VERSION_OK TRUE)
 if(SFML_FIND_VERSION AND SFML_INCLUDE_DIR)
-    # extract the major and minor version numbers from SFML/Config.hpp
-    # we have to handle framework a little bit differently :
-    if("${SFML_INCLUDE_DIR}" MATCHES "SFML.framework")
-        set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/Headers/Config.hpp")
-    else()
-        set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/SFML/Config.hpp")
+  # extract the major and minor version numbers from SFML/Config.hpp
+  # we have to handle framework a little bit differently :
+  if("${SFML_INCLUDE_DIR}" MATCHES "SFML.framework")
+    set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/Headers/Config.hpp")
+  else()
+    set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/SFML/Config.hpp")
+  endif()
+  FILE(READ "${SFML_CONFIG_HPP_INPUT}" SFML_CONFIG_HPP_CONTENTS)
+  STRING(REGEX MATCH "#define SFML_VERSION_MAJOR[ \t]+([0-9]+)" SFML_VERSION_MAJOR_MATCH "${SFML_CONFIG_HPP_CONTENTS}")
+  STRING(REGEX MATCH "#define SFML_VERSION_MINOR[ \t]+([0-9]+)" SFML_VERSION_MINOR_MATCH "${SFML_CONFIG_HPP_CONTENTS}")
+  STRING(REGEX REPLACE "#define SFML_VERSION_MAJOR[ \t]+([0-9]+)" "\\1" SFML_VERSION_MAJOR "${SFML_VERSION_MAJOR_MATCH}")
+  STRING(REGEX REPLACE "#define SFML_VERSION_MINOR[ \t]+([0-9]+)" "\\1" SFML_VERSION_MINOR "${SFML_VERSION_MINOR_MATCH}")
+  math(EXPR SFML_REQUESTED_VERSION "${SFML_FIND_VERSION_MAJOR} * 10 + ${SFML_FIND_VERSION_MINOR}")
+
+  # if we could extract them, compare with the requested version number
+  if (SFML_VERSION_MAJOR)
+    # transform version numbers to an integer
+    math(EXPR SFML_VERSION "${SFML_VERSION_MAJOR} * 10 + ${SFML_VERSION_MINOR}")
+
+    # compare them
+    if(SFML_VERSION LESS SFML_REQUESTED_VERSION)
+      set(SFML_VERSION_OK FALSE)
     endif()
-    FILE(READ "${SFML_CONFIG_HPP_INPUT}" SFML_CONFIG_HPP_CONTENTS)
-    STRING(REGEX MATCH "#define SFML_VERSION_MAJOR[ \t]+([0-9]+)" SFML_VERSION_MAJOR_MATCH "${SFML_CONFIG_HPP_CONTENTS}")
-    STRING(REGEX MATCH "#define SFML_VERSION_MINOR[ \t]+([0-9]+)" SFML_VERSION_MINOR_MATCH "${SFML_CONFIG_HPP_CONTENTS}")
-    STRING(REGEX REPLACE "#define SFML_VERSION_MAJOR[ \t]+([0-9]+)" "\\1" SFML_VERSION_MAJOR "${SFML_VERSION_MAJOR_MATCH}")
-    STRING(REGEX REPLACE "#define SFML_VERSION_MINOR[ \t]+([0-9]+)" "\\1" SFML_VERSION_MINOR "${SFML_VERSION_MINOR_MATCH}")
-    math(EXPR SFML_REQUESTED_VERSION "${SFML_FIND_VERSION_MAJOR} * 10 + ${SFML_FIND_VERSION_MINOR}")
-
-    # if we could extract them, compare with the requested version number
-    if (SFML_VERSION_MAJOR)
-        # transform version numbers to an integer
-        math(EXPR SFML_VERSION "${SFML_VERSION_MAJOR} * 10 + ${SFML_VERSION_MINOR}")
-
-        # compare them
-        if(SFML_VERSION LESS SFML_REQUESTED_VERSION)
-            set(SFML_VERSION_OK FALSE)
-        endif()
-    else()
-        # SFML version is < 3.0
-        if (SFML_REQUESTED_VERSION GREATER 29)
-            set(SFML_VERSION_OK FALSE)
-            if (SFML_REQUESTED_VERSION GREATER 19)
-                set(SFML_VERSION_MAJOR 1)
-            else()
-                set(SFML_VERSION_MAJOR 2)
-            endif()
-            set(SFML_VERSION_MINOR x)
-        endif()
+  else()
+    # SFML version is < 3.0
+    if (SFML_REQUESTED_VERSION GREATER 29)
+      set(SFML_VERSION_OK FALSE)
+      if (SFML_REQUESTED_VERSION GREATER 19)
+        set(SFML_VERSION_MAJOR 1)
+      else()
+        set(SFML_VERSION_MAJOR 2)
+      endif()
+      set(SFML_VERSION_MINOR x)
     endif()
+  endif()
 endif()
 
 # find the requested modules
@@ -130,101 +130,101 @@ set(FIND_SFML_LIB_PATHS
     /opt/csw
     /opt)
 foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
-    string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
-    string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
-    set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}${FIND_SFML_LIB_SUFFIX})
-
-    # no suffix for sfml-main, it is always a static library
-    if(FIND_SFML_COMPONENT_LOWER STREQUAL "main")
-        set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER})
+  string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
+  string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
+  set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}${FIND_SFML_LIB_SUFFIX})
+
+  # no suffix for sfml-main, it is always a static library
+  if(FIND_SFML_COMPONENT_LOWER STREQUAL "main")
+    set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER})
+  endif()
+
+  # debug library
+  find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG
+                NAMES ${FIND_SFML_COMPONENT_NAME}-d
+                PATH_SUFFIXES lib64 lib
+                PATHS ${FIND_SFML_LIB_PATHS})
+
+  # release library
+  find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
+                NAMES ${FIND_SFML_COMPONENT_NAME}
+                PATH_SUFFIXES lib64 lib
+                PATHS ${FIND_SFML_LIB_PATHS})
+
+  if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG OR SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
+    # library found
+    set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND TRUE)
+
+    # if both are found, set SFML_XXX_LIBRARY to contain both
+    if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
+      set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY debug     ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG}
+                                                    optimized ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
     endif()
 
-    # debug library
-    find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG
-                 NAMES ${FIND_SFML_COMPONENT_NAME}-d
-                 PATH_SUFFIXES lib64 lib
-                 PATHS ${FIND_SFML_LIB_PATHS})
-
-    # release library
-    find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
-                 NAMES ${FIND_SFML_COMPONENT_NAME}
-                 PATH_SUFFIXES lib64 lib
-                 PATHS ${FIND_SFML_LIB_PATHS})
-
-    if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG OR SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
-        # library found
-        set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND TRUE)
-
-        # if both are found, set SFML_XXX_LIBRARY to contain both
-        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY debug     ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG}
-                                                          optimized ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
-        endif()
-
-        # if only one debug/release variant is found, set the other to be equal to the found one
-        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
-            # debug and not release
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY         ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
-        endif()
-        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG)
-            # release and not debug
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY       ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
-        endif()
-    else()
-        # library not found
-        set(SFML_FOUND FALSE)
-        set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND FALSE)
-        set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY "")
-        set(FIND_SFML_MISSING "${FIND_SFML_MISSING} SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY")
+    # if only one debug/release variant is found, set the other to be equal to the found one
+    if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
+      # debug and not release
+      set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
+      set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY         ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
     endif()
-
-    # mark as advanced
-    MARK_AS_ADVANCED(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY
-                     SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
-                     SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG)
-
-    # add to the global list of libraries
-    set(SFML_LIBRARIES ${SFML_LIBRARIES} "${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY}")
+    if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG)
+      # release and not debug
+      set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
+      set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY       ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
+    endif()
+  else()
+    # library not found
+    set(SFML_FOUND FALSE)
+    set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND FALSE)
+    set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY "")
+    set(FIND_SFML_MISSING "${FIND_SFML_MISSING} SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY")
+  endif()
+
+  # mark as advanced
+  MARK_AS_ADVANCED(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY
+                    SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
+                    SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG)
+
+  # add to the global list of libraries
+  set(SFML_LIBRARIES ${SFML_LIBRARIES} "${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY}")
 endforeach()
 
 # handle errors
 if(NOT SFML_VERSION_OK)
-    # SFML version not ok
-    set(FIND_SFML_ERROR "SFML found but version too low (requested: ${SFML_FIND_VERSION}, found: ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR})")
-    set(SFML_FOUND FALSE)
+  # SFML version not ok
+  set(FIND_SFML_ERROR "SFML found but version too low (requested: ${SFML_FIND_VERSION}, found: ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR})")
+  set(SFML_FOUND FALSE)
 elseif(NOT SFML_FOUND)
-    # include directory or library not found
-    set(FIND_SFML_ERROR "Could NOT find SFML (missing: ${FIND_SFML_MISSING})")
+  # include directory or library not found
+  set(FIND_SFML_ERROR "Could NOT find SFML (missing: ${FIND_SFML_MISSING})")
 endif()
 if (NOT SFML_FOUND)
-    if(SFML_FIND_REQUIRED)
-        # fatal error
-        message(FATAL_ERROR ${FIND_SFML_ERROR})
-    elseif(NOT SFML_FIND_QUIETLY)
-        # error but continue
-        message(STATUS "${FIND_SFML_ERROR}")
-    endif()
+  if(SFML_FIND_REQUIRED)
+    # fatal error
+    message(FATAL_ERROR ${FIND_SFML_ERROR})
+  elseif(NOT SFML_FIND_QUIETLY)
+    # error but continue
+    message(STATUS "${FIND_SFML_ERROR}")
+  endif()
 endif()
 
 # handle success
 if(SFML_FOUND)
-    message(STATUS "Found SFML ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR} in ${SFML_INCLUDE_DIR}")
-    foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
-        string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
-        string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
-        if(NOT TARGET sfml-${FIND_SFML_COMPONENT_LOWER})
-            add_library(sfml-${FIND_SFML_COMPONENT_LOWER} UNKNOWN IMPORTED)
-            set_target_properties(sfml-${FIND_SFML_COMPONENT_LOWER} PROPERTIES
-                IMPORTED_LOCATION "${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY}"
-                INTERFACE_INCLUDE_DIRECTORIES "${SFML_INCLUDE_DIR}"
-            )
-            if(NOT ${FIND_SFML_COMPONENT_LOWER} STREQUAL system)
-                set_target_properties(sfml-${FIND_SFML_COMPONENT_LOWER} PROPERTIES
-                    INTERFACE_LINK_LIBRARIES sfml-system
-                )
-            endif()
-        endif()
-    endforeach()
+  message(STATUS "Found SFML ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR} in ${SFML_INCLUDE_DIR}")
+  foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
+    string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
+    string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
+    if(NOT TARGET sfml-${FIND_SFML_COMPONENT_LOWER})
+      add_library(sfml-${FIND_SFML_COMPONENT_LOWER} UNKNOWN IMPORTED)
+      set_target_properties(sfml-${FIND_SFML_COMPONENT_LOWER} PROPERTIES
+        IMPORTED_LOCATION "${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${SFML_INCLUDE_DIR}"
+      )
+      if(NOT ${FIND_SFML_COMPONENT_LOWER} STREQUAL system)
+        set_target_properties(sfml-${FIND_SFML_COMPONENT_LOWER} PROPERTIES
+          INTERFACE_LINK_LIBRARIES sfml-system
+        )
+      endif()
+    endif()
+  endforeach()
 endif()
diff --git a/CMake/FindSYSTEMD.cmake b/CMake/FindSYSTEMD.cmake
index d3a706ad19..c0eab93c31 100644
--- a/CMake/FindSYSTEMD.cmake
+++ b/CMake/FindSYSTEMD.cmake
@@ -2,28 +2,28 @@ find_package(PkgConfig QUIET)
 pkg_check_modules(PC_SYSTEMD QUIET "libsystemd")
 
 if (PC_SYSTEMD_FOUND)
-	add_definitions(${PC_SYSTEMD_CFLAGS} ${PC_SYSTEMD_CFLAGS_OTHER})
+  add_definitions(${PC_SYSTEMD_CFLAGS} ${PC_SYSTEMD_CFLAGS_OTHER})
 endif(PC_SYSTEMD_FOUND)
 
 find_path(
-    SYSTEMD_INCLUDE_DIRS
-    NAMES systemd/sd-daemon.h
-    HINTS ${PC_SYSTEMD_INCLUDEDIR} ${PC_SYSTEMD_INCLUDE_DIRS}
+  SYSTEMD_INCLUDE_DIRS
+  NAMES systemd/sd-daemon.h
+  HINTS ${PC_SYSTEMD_INCLUDEDIR} ${PC_SYSTEMD_INCLUDE_DIRS}
 )
 
 find_library(
-    SYSTEMD_LIBRARIES
-    NAMES systemd
-    HINTS ${PC_SYSTEMD_LIBDIR} ${PC_SYSTEMD_LIBRARY_DIRS}
+  SYSTEMD_LIBRARIES
+  NAMES systemd
+  HINTS ${PC_SYSTEMD_LIBDIR} ${PC_SYSTEMD_LIBRARY_DIRS}
 )
 
 include(FindPackageHandleStandardArgs)
 
 find_package_handle_standard_args(
-    SYSTEMD
-    REQUIRED_VARS SYSTEMD_LIBRARIES SYSTEMD_INCLUDE_DIRS
+  SYSTEMD
+  REQUIRED_VARS SYSTEMD_LIBRARIES SYSTEMD_INCLUDE_DIRS
 )
 mark_as_advanced(
-    SYSTEMD_FOUND
-    SYSTEMD_LIBRARIES SYSTEMD_INCLUDE_DIRS
+  SYSTEMD_FOUND
+  SYSTEMD_LIBRARIES SYSTEMD_INCLUDE_DIRS
 )
diff --git a/CMake/RemoveCompileFlag.cmake b/CMake/RemoveCompileFlag.cmake
index 1bb9c167be..e29ae38631 100644
--- a/CMake/RemoveCompileFlag.cmake
+++ b/CMake/RemoveCompileFlag.cmake
@@ -8,9 +8,9 @@
 #   _flag       - The compile flag to remove
 #
 macro(remove_cxx_flag_from_target _target _flag)
-    get_target_property(_target_cxx_flags ${_target} COMPILE_OPTIONS)
-    if(_target_cxx_flags)
-        list(REMOVE_ITEM _target_cxx_flags ${_flag})
-        set_target_properties(${_target} PROPERTIES COMPILE_OPTIONS "${_target_cxx_flags}")
-    endif()
+  get_target_property(_target_cxx_flags ${_target} COMPILE_OPTIONS)
+  if(_target_cxx_flags)
+    list(REMOVE_ITEM _target_cxx_flags ${_flag})
+    set_target_properties(${_target} PROPERTIES COMPILE_OPTIONS "${_target_cxx_flags}")
+  endif()
 endmacro()