CMakeLists.txt code reformat

Zielon · Jun 25, 2021 · acd5215 · acd5215
1 parent 6c1d1dd
commit acd5215
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 39 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,33 +12,32 @@ foreach (OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${PROJECT_BINARY_DIR}/bin)
     set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${PROJECT_BINARY_DIR}/bin)
     set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${PROJECT_BINARY_DIR}/lib)
-endforeach()
+endforeach ()
 
-set (CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 17)
 
 if (MSVC)
-	foreach (flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-		if (${flag_var} MATCHES "/MD")
-			string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-		endif()
-	endforeach()
-	
-	add_compile_options("/MP")
-endif()
+    foreach (flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+        if (${flag_var} MATCHES "/MD")
+            string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
+        endif ()
+    endforeach ()
+
+    add_compile_options("/MP")
+endif ()
 
 if (UNIX)
-
-	add_definitions(-DUNIX)
-	add_compile_options("-Wall")
-	add_compile_options("-fvisibility=hidden")
-
-	find_package(Backtrace REQUIRED)
+    add_definitions(-DUNIX)
+    add_compile_options("-Wall")
+    add_compile_options("-fvisibility=hidden")
+
+    find_package(Backtrace REQUIRED)
 
-	string(COMPARE EQUAL ${Backtrace_HEADER} "backtrace.h" BacktraceRequired)
+    string(COMPARE EQUAL ${Backtrace_HEADER} "backtrace.h" BacktraceRequired)
 
-	if (BacktraceRequired)
-		add_compile_definitions(BOOST_STACKTRACE_USE_BACKTRACE)
-	endif (BacktraceRequired)
+    if (BacktraceRequired)
+        add_compile_definitions(BOOST_STACKTRACE_USE_BACKTRACE)
+    endif (BacktraceRequired)
 
 endif ()
 
@@ -53,19 +52,19 @@ add_definitions(-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS)
 
 IF (NOT Vulkan_FOUND)
     message(FATAL_ERROR "Could not find Vulkan library!")
-ELSE()
+ELSE ()
     message(STATUS ${Vulkan_LIBRARY})
-ENDIF()
+ENDIF ()
+
+find_program(Vulkan_GLSLANG_VALIDATOR
+        NAMES glslangValidator
+        HINTS ENV VULKAN_SDK
+        PATH_SUFFIXES bin)
 
-find_program(Vulkan_GLSLANG_VALIDATOR 
-	NAMES glslangValidator 
-	HINTS ENV VULKAN_SDK 
-	PATH_SUFFIXES bin)
-
 if (NOT Vulkan_GLSLANG_VALIDATOR)
     message(FATAL_ERROR "glslangValidator not found!")
-endif()
+endif ()
 
 set(MAIN_PROJECT "PBRVulkan")
 add_subdirectory(PBRVulkan/RayTracer/src)
-set_property (DIRECTORY PROPERTY VS_STARTUP_PROJECT ${MAIN_PROJECT})
+set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT ${MAIN_PROJECT})
diff --git a/PBRVulkan/RayTracer/src/CMakeLists.txt b/PBRVulkan/RayTracer/src/CMakeLists.txt
@@ -7,31 +7,31 @@ set(src_files_assets
         Assets/Mesh.h
         Assets/Texture.h
         Assets/Texture.cpp
-    )
+        )
 
 set(src_files_geometry
         Geometry/Compute.h
         Geometry/Global.h
         Geometry/Vertex.h
-    )
+        )
 
 set(src_files_3rdParty
         3rdParty/HDRLoader.cpp
         3rdParty/HDRLoader.h
-    )
+        )
 
 set(src_files_imgui
         ImGui/imgui_impl_glfw.cpp
         ImGui/imgui_impl_glfw.h
         ImGui/imgui_impl_vulkan.cpp
         ImGui/imgui_impl_vulkan.h
-    )
+        )
 
 set(src_files_loader
         Loader/Loader.cpp
         Loader/Loader.h
         Loader/RenderOptions.h
-    )
+        )
 
 set(src_files_tracer
         Tracer/Widgets/CinemaWidget.cpp
@@ -55,7 +55,7 @@ set(src_files_tracer
         Tracer/Settings.h
         Tracer/TextureImage.cpp
         Tracer/TextureImage.h
-    )
+        )
 
 set(src_files_vulkan
         Vulkan/AccelerationStructure.cpp
@@ -125,11 +125,11 @@ set(src_files_vulkan
         Vulkan/RenderPass.h
         Vulkan/Surface.cpp
         Vulkan/TLAS.h
-    )
+        )
 
 set(src_files
         main.cpp
-    )
+        )
 
 source_group("3rdParty" FILES ${src_files_3rdParty})
 source_group("Assets" FILES ${src_files_assets})
@@ -149,13 +149,13 @@ add_executable(${exe_name}
         ${src_files_tracer}
         ${src_files_vulkan}
         ${src_files}
-    )
+        )
 
 if (UNIX)
     # GCC8 needs an extra lib for <filesystem>.
     # This is not needed with GCC9 or higher.
     set(extra_libs -lstdc++fs ${Backtrace_LIBRARIES})
-endif()
+endif ()
 
 set_target_properties(${exe_name} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
 target_include_directories(${exe_name} PRIVATE . ${Boost_INCLUDE_DIRS} ${glfw3_INCLUDE_DIRS} ${glm_INCLUDE_DIRS} ${STB_INCLUDE_DIRS} ${Vulkan_INCLUDE_DIRS})