diff --git a/CMakeLists.txt b/CMakeLists.txt
index 958b2a11d6b..84d4424ec42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -795,7 +795,7 @@ endif()
 if(NOT APPLE)
   option(WITH_VULKAN_BACKEND "Enable Vulkan as graphics backend (experimental)" ON)
   option(WITH_VULKAN_GUARDEDALLOC "\
-  Use guardedalloc for host allocations done inside Vulkan (development option)"
+Use guardedalloc for host allocations done inside Vulkan (development option)"
     OFF
   )
   mark_as_advanced(
diff --git a/build_files/build_environment/cmake/ffmpeg.cmake b/build_files/build_environment/cmake/ffmpeg.cmake
index 9bd61977e2f..78d8de52674 100644
--- a/build_files/build_environment/cmake/ffmpeg.cmake
+++ b/build_files/build_environment/cmake/ffmpeg.cmake
@@ -39,17 +39,19 @@ set(FFMPEG_PATCH_FILE)
 
 if(WIN32)
   set(FFMPEG_CFLAGS "\
-  ${FFMPEG_CFLAGS} \
-  -I${temp_LIBDIR}/openjpeg_msvc/include/openjpeg-2.5 \
-  -I${temp_LIBDIR}/opus/include/opus \
-  -DOPJ_STATIC \
-  -MD \
-  -UHAVE_UNISTD_H")
+${FFMPEG_CFLAGS} \
+-I${temp_LIBDIR}/openjpeg_msvc/include/openjpeg-2.5 \
+-I${temp_LIBDIR}/opus/include/opus \
+-DOPJ_STATIC \
+-MD \
+-UHAVE_UNISTD_H"
+  )
 
   set(FFMPEG_LDFLAGS "\
-  ${FFMPEG_LDFLAGS} \
-  ${LIBDIR_FLAG}${temp_LIBDIR}/openjpeg_msvc/lib \
-  ucrt.lib")
+${FFMPEG_LDFLAGS} \
+${LIBDIR_FLAG}${temp_LIBDIR}/openjpeg_msvc/lib \
+ucrt.lib"
+  )
 
   # As we now use MSVC on windows, pkgconfig is not really a viable option for many packages
   # so this patch removes those checks in favour of looking for the libs directly.
diff --git a/build_files/build_environment/cmake/sqlite.cmake b/build_files/build_environment/cmake/sqlite.cmake
index c54f483b104..fca5d9b62a7 100644
--- a/build_files/build_environment/cmake/sqlite.cmake
+++ b/build_files/build_environment/cmake/sqlite.cmake
@@ -9,24 +9,29 @@ if(UNIX)
   if(NOT APPLE)
     set(SQLITE_LDFLAGS -Wl,--as-needed)
   endif()
-  set(SQLITE_CFLAGS
-    "-DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_COLUMN_METADATA \
-    -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
-    -DSQLITE_ENABLE_RTREE=1 -DSQLITE_SOUNDEX=1 \
-    -DSQLITE_ENABLE_UNLOCK_NOTIFY \
-    -DSQLITE_OMIT_LOOKASIDE=1 -DSQLITE_ENABLE_DBSTAT_VTAB \
-    -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 \
-    -DSQLITE_ENABLE_LOAD_EXTENSION \
-    -DSQLITE_ENABLE_JSON1 \
-    -DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
-    -DSQLITE_THREADSAFE=1 \
-    -DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
-    -DSQLITE_MAX_SCHEMA_RETRY=25 \
-    -DSQLITE_ENABLE_PREUPDATE_HOOK \
-    -DSQLITE_ENABLE_SESSION \
-    -DSQLITE_ENABLE_STMTVTAB \
-    -DSQLITE_MAX_VARIABLE_NUMBER=250000 \
-    -fPIC")
+  set(SQLITE_CFLAGS "\
+-DSQLITE_SECURE_DELETE \
+-DSQLITE_ENABLE_COLUMN_METADATA \
+-DSQLITE_ENABLE_FTS3 \
+-DSQLITE_ENABLE_FTS3_PARENTHESIS \
+-DSQLITE_ENABLE_RTREE=1 \
+-DSQLITE_SOUNDEX=1 \
+-DSQLITE_ENABLE_UNLOCK_NOTIFY \
+-DSQLITE_OMIT_LOOKASIDE=1 \
+-DSQLITE_ENABLE_DBSTAT_VTAB \
+-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 \
+-DSQLITE_ENABLE_LOAD_EXTENSION \
+-DSQLITE_ENABLE_JSON1 \
+-DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
+-DSQLITE_THREADSAFE=1 \
+-DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
+-DSQLITE_MAX_SCHEMA_RETRY=25 \
+-DSQLITE_ENABLE_PREUPDATE_HOOK \
+-DSQLITE_ENABLE_SESSION \
+-DSQLITE_ENABLE_STMTVTAB \
+-DSQLITE_MAX_VARIABLE_NUMBER=250000 \
+-fPIC"
+  )
   set(SQLITE_CONFIGURE_ENV ${SQLITE_CONFIGURE_ENV} && export LDFLAGS=${SQLITE_LDFLAGS} && export CFLAGS=${SQLITE_CFLAGS})
   set(SQLITE_CONFIGURATION_ARGS
     ${SQLITE_CONFIGURATION_ARGS}
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 443e190e2d9..720f89af127 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -668,16 +668,16 @@ if(UNIX AND NOT APPLE)
       # OpenGL now that the lib/ folder is used for other libraries.
       install(
         CODE "\
-        file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so)\n
-        file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so.1)\n
-        file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so.1.5.0)\n
-        file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so)\n
-        file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so.1)\n
-        file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so.1.3.1)\n
-        file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so)\n
-        file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so.0)\n
-        file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so.0.0.0)\n
-        "
+file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so)\n
+file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so.1)\n
+file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGL.so.1.5.0)\n
+file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so)\n
+file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so.1)\n
+file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libGLU.so.1.3.1)\n
+file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so)\n
+file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so.0)\n
+file(REMOVE ${CMAKE_BINARY_DIR}/bin/lib/libglapi.so.0.0.0)\n
+"
       )
     endif()
   else()