Clean up build scripts to adhere to format convention.

Source/CMake/Modules/Urho3D-CMake-magic.cmake

@@ -279,7 +279,7 @@ if (ENABLE_SAMPLES AND ENABLE_EXTRAS AND ENABLE_TOOLS AND
     SCP_TO_TARGET AND
     ANDROID_ABI AND
     ENABLE_SAFE_LUA)
-endif()
+endif ()
 
 # Override builtin macro and function to suit our need, always generate header file regardless of target type...
 macro (_DO_SET_MACRO_VALUES TARGET_LIBRARY)
@@ -314,10 +314,10 @@ function (GENERATE_EXPORT_HEADER TARGET_LIBRARY)
         message (WARNING "This macro should not be used with libraries of type MODULE")
         return ()
     endif ()
-    _test_compiler_hidden_visibility()
-    _test_compiler_has_deprecated()
-    _do_set_macro_values(${TARGET_LIBRARY})
-    _do_generate_export_header(${TARGET_LIBRARY} ${ARGN})
+    _test_compiler_hidden_visibility ()
+    _test_compiler_has_deprecated ()
+    _do_set_macro_values (${TARGET_LIBRARY})
+    _do_generate_export_header (${TARGET_LIBRARY} ${ARGN})
 endfunction ()
 
 # Override builtin function to suit our need, takes care of C flags as well as CXX flags
@@ -363,9 +363,9 @@ macro (enable_pch)
         foreach (FILE ${SOURCE_FILES})
             if (FILE MATCHES \\.cpp$)
                 if (FILE MATCHES Precompiled\\.cpp$)
-                    set_source_files_properties(${FILE} PROPERTIES COMPILE_FLAGS "/YcPrecompiled.h")
+                    set_source_files_properties (${FILE} PROPERTIES COMPILE_FLAGS "/YcPrecompiled.h")
                 else ()
-                    set_source_files_properties(${FILE} PROPERTIES COMPILE_FLAGS "/YuPrecompiled.h")
+                    set_source_files_properties (${FILE} PROPERTIES COMPILE_FLAGS "/YuPrecompiled.h")
                 endif ()
             endif ()
         endforeach ()
@@ -476,7 +476,7 @@ macro (setup_main_executable)
     # Define resource files
     if (XCODE)
         set (RESOURCE_FILES ${PROJECT_ROOT_DIR}/Bin/CoreData ${PROJECT_ROOT_DIR}/Bin/Data)
-        set_source_files_properties(${RESOURCE_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+        set_source_files_properties (${RESOURCE_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
         list (APPEND SOURCE_FILES ${RESOURCE_FILES})
     endif ()
 
@@ -489,7 +489,7 @@ macro (setup_main_executable)
         define_dependency_libs (Urho3D)
         setup_library (SHARED)
         # Copy other dependent shared libraries to Android library output path
-        foreach(FILE ${ABSOLUTE_PATH_LIBS})
+        foreach (FILE ${ABSOLUTE_PATH_LIBS})
             get_filename_component (EXT ${FILE} EXT)
             if (EXT STREQUAL .so)
                 get_filename_component (NAME ${FILE} NAME)

Source/CMake/Toolchains/raspberrypi.toolchain.cmake

@@ -24,7 +24,7 @@ cmake_minimum_required (VERSION 2.6.3)
 
 if (CMAKE_TOOLCHAIN_FILE)
     # Reference toolchain variable to suppress "unused variable" warning
-endif()
+endif ()
 
 # this one is important
 set (CMAKE_SYSTEM_NAME Linux)

Source/CMakeLists.txt

@@ -82,7 +82,7 @@ foreach (TARGET Bullet Civetweb Detour FreeType JO kNet LZ4 PugiXml Recast SDL S
     add_subdirectory (ThirdParty/${TARGET})
 endforeach ()
 if (ENABLE_ANGELSCRIPT)
-    add_subdirectory(ThirdParty/AngelScript)
+    add_subdirectory (ThirdParty/AngelScript)
 endif ()
 if (ENABLE_LUA)
     add_subdirectory (Engine/LuaScript)

Source/Engine/IO/CMakeLists.txt

@@ -23,7 +23,7 @@
 # Define source files
 if (APPLE AND NOT IOS)
     set (GLOB_OBJC_PATTERN *.m)
-endif()
+endif ()
 define_source_files (GLOB_CPP_PATTERNS *.cpp ${GLOB_OBJC_PATTERN} PARENT_SCOPE)
 
 # Define dependency libs

Source/ThirdParty/AngelScript/CMakeLists.txt

@@ -19,11 +19,11 @@ if (IOS OR ANDROID OR RASPI)
 endif ()
 
 if (MSVC AND ENABLE_64BIT)
-    enable_language(ASM_MASM)
+    enable_language (ASM_MASM)
     # Commented out due to cmake bug
     #set (ASM_FILES source/as_callfunc_x64_msvc_asm.asm)
     # As a temporary workaround
-    add_custom_command(OUTPUT as_callfunc_x64_msvc_asm.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm COMMENT "Temporary workaround for MASM") 
+    add_custom_command (OUTPUT as_callfunc_x64_msvc_asm.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm COMMENT "Temporary workaround for MASM") 
     set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm)
 endif ()
 

Source/ThirdParty/LibCpuId/CMakeLists.txt

@@ -11,11 +11,11 @@ file (GLOB H_FILES
 )
 
 if (MSVC AND ENABLE_64BIT)
-    enable_language(ASM_MASM)
+    enable_language (ASM_MASM)
     # Commented out due to cmake bug
     #set (ASM_FILES src/masm-x64.asm)
     # As a temporary workaround
-    add_custom_command(OUTPUT masm-x64.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm COMMENT "Temporary workaround for MASM") 
+    add_custom_command (OUTPUT masm-x64.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm COMMENT "Temporary workaround for MASM") 
     set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm)
 endif ()
 

Source/ThirdParty/LuaJIT/CMakeLists.txt

@@ -210,7 +210,7 @@ set (TARGET_NAME LuaJIT)
 macro (generate_source name mode)
     set (GEN_SRC ${CMAKE_CURRENT_BINARY_DIR}/generated/${name})
     set (GEN_SRCS ${GEN_SRCS} ${GEN_SRC}) 
-    add_custom_command(OUTPUT ${GEN_SRC}
+    add_custom_command (OUTPUT ${GEN_SRC}
         COMMAND ${PROJECT_ROOT_DIR}/Bin/${BUILDVM_X} -m ${mode} -o ${GEN_SRC} ${ARGN} DEPENDS ${BUILDVM_DEP} ${ARGN}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         COMMENT "Generating buildvm output: ${name}")
@@ -242,7 +242,7 @@ set (LJLIB_C src/lib_base.c src/lib_math.c src/lib_bit.c src/lib_string.c src/li
 generate_source (${LJVM_BOUT} ${LJVM_MODE})
 foreach (MODE bcdef ffdef libdef recdef)
     generate_source (lj_${MODE}.h ${MODE} ${LJLIB_C})
-endforeach()
+endforeach ()
 generate_source (lj_folddef.h folddef src/lj_opt_fold.c)
 
 # Define source files

Source/ThirdParty/LuaJIT/DetectTargetArchitecture.cmake

@@ -175,15 +175,15 @@ elseif (TARGET_LJARCH STREQUAL arm)
         set (DASM_AFLAGS ${DASM_AFLAGS} -D IOS)
     endif ()
 elseif (TARGET_LJARCH STREQUAL ppc)
-    find_string("LJ_ARCH_SQRT (1)" "${TARGET_TESTARCH}" ARCH_SQRT ${VARIANT})
+    find_string ("LJ_ARCH_SQRT (1)" "${TARGET_TESTARCH}" ARCH_SQRT ${VARIANT})
     if (ARCH_SQRT)
         set (DASM_AFLAGS ${DASM_AFLAGS} -D SQRT)
     endif ()
-    find_string("LJ_ARCH_ROUND (1)" "${TARGET_TESTARCH}" ARCH_ROUND ${VARIANT})
+    find_string ("LJ_ARCH_ROUND (1)" "${TARGET_TESTARCH}" ARCH_ROUND ${VARIANT})
     if (ARCH_ROUND)
         set (DASM_AFLAGS ${DASM_AFLAGS} -D ROUND)
     endif ()
-    find_string("LJ_ARCH_PPC64 (1)" "${TARGET_TESTARCH}" ARCH_PPC64 ${VARIANT})
+    find_string ("LJ_ARCH_PPC64 (1)" "${TARGET_TESTARCH}" ARCH_PPC64 ${VARIANT})
     if (ARCH_PPC64)
         set (DASM_AFLAGS ${DASM_AFLAGS} -D GPR64)
     endif ()

Source/ThirdParty/MojoShader/CMakeLists.txt

@@ -6,10 +6,10 @@ file (GLOB C_FILES *.c)
 file (GLOB H_FILES *.h)
 set (SOURCE_FILES ${C_FILES} ${H_FILES})
 
-add_definitions(-DMOJOSHADER_NO_VERSION_INCLUDE)
-if(MSVC)
-    add_definitions(-D_CRT_SECURE_NO_WARNINGS=1 -TP)
-endif(MSVC)
+add_definitions (-DMOJOSHADER_NO_VERSION_INCLUDE)
+if (MSVC)
+    add_definitions (-D_CRT_SECURE_NO_WARNINGS=1 -TP)
+endif (MSVC)
 
 # Setup target
 setup_library ()

Source/ThirdParty/kNet/CMakeLists.txt

@@ -16,44 +16,44 @@
 
 set (TARGET_NAME kNet)
 
-file(GLOB kNetSourceFiles ./src/*.cpp)
-file(GLOB kNetHeaderFiles ./include/*.h ./include/kNet/*.h ./include/kNet/*.inl)
+file (GLOB kNetSourceFiles ./src/*.cpp)
+file (GLOB kNetHeaderFiles ./include/*.h ./include/kNet/*.h ./include/kNet/*.inl)
 
 if (WIN32)
-   file(GLOB kNetWin32SourceFiles ./src/win32/*.cpp)
-   file(GLOB kNetWin32HeaderFiles ./include/kNet/win32/*.h)
+   file (GLOB kNetWin32SourceFiles ./src/win32/*.cpp)
+   file (GLOB kNetWin32HeaderFiles ./include/kNet/win32/*.h)
 
    if (USE_BOOST)
-      list(REMOVE_ITEM kNetWin32SourceFiles ${CMAKE_CURRENT_SOURCE_DIR}/./src/win32/W32Thread.cpp)
-   endif()
+      list (REMOVE_ITEM kNetWin32SourceFiles ${CMAKE_CURRENT_SOURCE_DIR}/./src/win32/W32Thread.cpp)
+   endif ()
 
-   set(kNetSourceFiles ${kNetSourceFiles} ${kNetWin32SourceFiles})
-   set(kNetHeaderFiles ${kNetHeaderFiles} ${kNetWin32HeaderFiles})
+   set (kNetSourceFiles ${kNetSourceFiles} ${kNetWin32SourceFiles})
+   set (kNetHeaderFiles ${kNetHeaderFiles} ${kNetWin32HeaderFiles})
 
-   add_definitions(-D_WINSOCKAPI_)
-   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-   add_definitions(-DKNET_MEMORY_LEAK_CHECK)
+   add_definitions (-D_WINSOCKAPI_)
+   add_definitions (-D_CRT_SECURE_NO_WARNINGS)
+   add_definitions (-DKNET_MEMORY_LEAK_CHECK)
 elseif (UNIX)
    list (REMOVE_ITEM kNetSourceFiles ${CMAKE_CURRENT_SOURCE_DIR}/./src/Clock.cpp)
-   file(GLOB kNetUnixSourceFiles ./src/unix/*.cpp)
-   file(GLOB kNetUnixHeaderFiles ./include/*.h ./include/kNet/*.h ./include/kNet/unix/*.h)
+   file (GLOB kNetUnixSourceFiles ./src/unix/*.cpp)
+   file (GLOB kNetUnixHeaderFiles ./include/*.h ./include/kNet/*.h ./include/kNet/unix/*.h)
 
    if (USE_BOOST)
-      list(REMOVE_ITEM kNetUnixSourceFiles ${CMAKE_CURRENT_SOURCE_DIR}/./src/unix/UnixThread.cpp)
-   endif()
+      list (REMOVE_ITEM kNetUnixSourceFiles ${CMAKE_CURRENT_SOURCE_DIR}/./src/unix/UnixThread.cpp)
+   endif ()
 
-   set(kNetSourceFiles ${kNetSourceFiles} ${kNetUnixSourceFiles})
-   set(kNetHeaderFiles ${kNetHeaderFiles} ${kNetUnixHeaderFiles})
+   set (kNetSourceFiles ${kNetSourceFiles} ${kNetUnixSourceFiles})
+   set (kNetHeaderFiles ${kNetHeaderFiles} ${kNetUnixHeaderFiles})
 
-   add_definitions(-DUNIX)
-endif()
+   add_definitions (-DUNIX)
+endif ()
 
 # Urho3D: set DEBUG_CPP_NAME only on Windows, Xcode project file can not be opened if this is included
 if (WIN32)
-    foreach(srcFile ${kNetSourceFiles})
-        get_filename_component(baseName ${srcFile} NAME)
-        set_source_files_properties(${srcFile} PROPERTIES COMPILE_FLAGS "-DDEBUG_CPP_NAME=\"\\\"${baseName}\"\\\"")
-    endforeach()
+    foreach (srcFile ${kNetSourceFiles})
+        get_filename_component (baseName ${srcFile} NAME)
+        set_source_files_properties (${srcFile} PROPERTIES COMPILE_FLAGS "-DDEBUG_CPP_NAME=\"\\\"${baseName}\"\\\"")
+    endforeach ()
 endif ()
 
 # Define source files

Source/Tools/ShaderCompiler/CMakeLists.txt

@@ -32,5 +32,5 @@ set (LIBS ../../ThirdParty/MojoShader)
 set (ABSOLUTE_PATH_LIBS ${DIRECT3D_COMPILER_LIBRARY})
 
 # Setup target
-add_definitions(-DMOJOSHADER_NO_VERSION_INCLUDE)
+add_definitions (-DMOJOSHADER_NO_VERSION_INCLUDE)
 setup_executable ()