Skip to content

Commit

Permalink
Revert more whitespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexanderVeselov committed Aug 16, 2018
1 parent 537f63d commit bcffe74
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
20 changes: 10 additions & 10 deletions Baikal/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ set(CONTROLLERS_SOURCES
Controllers/scene_controller.h
Controllers/scene_controller.inl
Controllers/scene_controller.cpp)

set(ESTIMATORS_SOURCES
set(ESTIMATORS_SOURCES
Estimators/estimator.h
Estimators/path_tracing_estimator.cpp
Estimators/path_tracing_estimator.h)

set(OUTPUT_SOURCES
Output/clwoutput.h
Output/output.h)

set(POSTEFFECT_SOURCES
PostEffects/clw_post_effect.h
PostEffects/post_effect.h
PostEffects/bilateral_denoiser.h
PostEffects/wavelet_denoiser.h
PostEffects/AreaMap33.h
)

)
set(RENDERERS_SOURCES
Renderers/adaptive_renderer.cpp
Renderers/adaptive_renderer.h
Expand Down Expand Up @@ -85,11 +85,11 @@ set(SCENEGRAPH_SOURCES
SceneGraph/uberv2material.h
SceneGraph/inputmap.h
SceneGraph/inputmaps.h)

set(SCENEGRAPH_COLLECTOR_SOURCES
SceneGraph/Collector/collector.cpp
SceneGraph/Collector/collector.h)

set(XML_SOURCES
XML/tinyxml2.cpp
XML/tinyxml2.h)
Expand Down Expand Up @@ -120,7 +120,7 @@ set(KERNELS_SOURCES
Kernels/CL/wavelet_denoise.cl
Kernels/CL/path_tracing_estimator_uberv2.cl
Kernels/CL/fill_aovs_uberv2.cl
)
)

set(SOURCES
${CONTROLLERS_SOURCES}
Expand All @@ -135,8 +135,8 @@ set(SOURCES
${SCENEGRAPH_IO_SOURCES}
${XML_SOURCES}
${KERNELS_SOURCES}
)

)
source_group("Controllers" FILES ${CONTROLLERS_SOURCES})
source_group("Estimators" FILES ${ESTIMATORS_SOURCES})
source_group("Output" FILES ${OUTPUT_SOURCES})
Expand Down
6 changes: 3 additions & 3 deletions BaikalDataGenerator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ set(SOURCES
${DATAGENERATOR_SOURCES})

source_group("Source" FILES ${DATAGENERATOR_SOURCES})

add_executable(BaikalDataGenerator ${SOURCES})
target_compile_features(BaikalDataGenerator PRIVATE cxx_std_17)

# Add project root since BaikalStandalone directly includes Baikal/* files
#Add project root since BaikalStandalone directly includes Baikal/* files
target_include_directories(BaikalDataGenerator
PRIVATE ${Baikal_SOURCE_DIR}
PRIVATE .)

target_link_libraries(BaikalDataGenerator PRIVATE Baikal BaikalIO)

set_target_properties(BaikalDataGenerator
Expand Down
2 changes: 1 addition & 1 deletion BaikalIO/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set(SOURCES
scene_io.h
scene_test_io.cpp
scene_obj_io.cpp
)
)

if (BAIKAL_ENABLE_FBX)
list(APPEND SOURCES scene_fbx_io.cpp)
Expand Down
4 changes: 2 additions & 2 deletions BaikalStandalone/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ source_group("Application" FILES ${APPLICATION_SOURCES})
source_group("ImGUI" FILES ${IMGUI_SORUCES})
source_group("Utils" FILES ${UTILS_SOURCES})
source_group("Kernels\\GLSL" FILES ${KERNEL_SOURCES})

add_executable(BaikalStandalone ${SOURCES})
target_compile_features(BaikalStandalone PRIVATE cxx_std_14)

# Add project root since BaikalStandalone directly includes Baikal/* files
#Add project root since BaikalStandalone directly includes Baikal/* files
target_include_directories(BaikalStandalone
PRIVATE ${Baikal_SOURCE_DIR}
PRIVATE .)
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

# Find required packages
#Find required packages
find_package(Threads REQUIRED)
find_package(OIIO REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion RprSupport/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(SOURCES RprSupport.cpp)

add_library(RprSupport64 SHARED ${SOURCES})
target_compile_definitions(RprSupport64 PRIVATE RPR_EXPORT_API)
target_compile_features(RprSupport64 PRIVATE cxx_std_14)
Expand Down

0 comments on commit bcffe74

Please sign in to comment.