[Bf-blender-cvs] [41ec25d27ba] blender-v2.81-release: Cleanup: style
Campbell Barton
noreply at git.blender.org
Mon Oct 21 06:13:14 CEST 2019
Commit: 41ec25d27bac8c03e8d5e6ebd97c032137d1010e
Author: Campbell Barton
Date: Mon Oct 21 15:05:56 2019 +1100
Branches: blender-v2.81-release
https://developer.blender.org/rB41ec25d27bac8c03e8d5e6ebd97c032137d1010e
Cleanup: style
===================================================================
M build_files/build_environment/cmake/theora.cmake
M extern/quadriflow/CMakeLists.txt
M intern/ghost/test/CMakeLists.txt
M intern/quadriflow/CMakeLists.txt
M source/creator/CMakeLists.txt
===================================================================
diff --git a/build_files/build_environment/cmake/theora.cmake b/build_files/build_environment/cmake/theora.cmake
index 5d41fab5740..b1352c40e37 100644
--- a/build_files/build_environment/cmake/theora.cmake
+++ b/build_files/build_environment/cmake/theora.cmake
@@ -16,7 +16,7 @@
#
# ***** END GPL LICENSE BLOCK *****
-if (UNIX)
+if(UNIX)
set(THEORA_CONFIGURE_ENV ${CONFIGURE_ENV} && export HAVE_PDFLATEX=no)
else()
set(THEORA_CONFIGURE_ENV ${CONFIGURE_ENV})
diff --git a/extern/quadriflow/CMakeLists.txt b/extern/quadriflow/CMakeLists.txt
index 2e13bf17b17..0f10b8fe707 100644
--- a/extern/quadriflow/CMakeLists.txt
+++ b/extern/quadriflow/CMakeLists.txt
@@ -31,7 +31,7 @@ endif()
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
-if (WIN32)
+if(WIN32)
add_definitions(-D_USE_MATH_DEFINES)
endif()
@@ -46,7 +46,7 @@ set(LEMON_GEN_DIR ${CMAKE_BINARY_DIR}/extern/quadriflow/${LEMON_3RD_PATH})
configure_file(
${LEMON_SRC}/config.h.in
${LEMON_GEN_DIR}/lemon/config.h
- )
+)
set(LEMON_SOURCES
${LEMON_SRC}/arg_parser.cc
${LEMON_SRC}/base.cc
@@ -55,7 +55,7 @@ set(LEMON_SOURCES
${LEMON_SRC}/lp_skeleton.cc
${LEMON_SRC}/random.cc
${LEMON_SRC}/bits/windows.cc
- )
+)
set(INC
src
@@ -71,37 +71,37 @@ set(INC_SYS
)
set(SRC
- src/adjacent-matrix.cpp
- src/adjacent-matrix.hpp
- src/compare-key.hpp
- src/config.hpp
- src/dedge.cpp
- src/dedge.hpp
- src/disajoint-tree.hpp
- src/dset.hpp
- src/field-math.hpp
- src/flow.hpp
- src/hierarchy.cpp
- src/hierarchy.hpp
- src/loader.cpp
- src/loader.hpp
- src/localsat.cpp
- src/localsat.hpp
- src/merge-vertex.cpp
- src/merge-vertex.hpp
- src/optimizer.cpp
- src/optimizer.hpp
- src/parametrizer.cpp
- src/parametrizer-flip.cpp
- src/parametrizer-int.cpp
- src/parametrizer-mesh.cpp
- src/parametrizer-scale.cpp
- src/parametrizer-sing.cpp
- src/parametrizer.hpp
- src/serialize.hpp
- src/subdivide.cpp
- src/subdivide.hpp
- ${LEMON_SOURCES}
+ src/adjacent-matrix.cpp
+ src/adjacent-matrix.hpp
+ src/compare-key.hpp
+ src/config.hpp
+ src/dedge.cpp
+ src/dedge.hpp
+ src/disajoint-tree.hpp
+ src/dset.hpp
+ src/field-math.hpp
+ src/flow.hpp
+ src/hierarchy.cpp
+ src/hierarchy.hpp
+ src/loader.cpp
+ src/loader.hpp
+ src/localsat.cpp
+ src/localsat.hpp
+ src/merge-vertex.cpp
+ src/merge-vertex.hpp
+ src/optimizer.cpp
+ src/optimizer.hpp
+ src/parametrizer.cpp
+ src/parametrizer-flip.cpp
+ src/parametrizer-int.cpp
+ src/parametrizer-mesh.cpp
+ src/parametrizer-scale.cpp
+ src/parametrizer-sing.cpp
+ src/parametrizer.hpp
+ src/serialize.hpp
+ src/subdivide.cpp
+ src/subdivide.hpp
+ ${LEMON_SOURCES}
)
set(LIB
diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt
index a5a41209603..f97397715bf 100644
--- a/intern/ghost/test/CMakeLists.txt
+++ b/intern/ghost/test/CMakeLists.txt
@@ -126,27 +126,27 @@ add_library(glewmx_lib ${SRC_NEW})
# grr, blenfont needs BLI
include_directories(
- "../../../source/blender/blenlib"
- )
+ "../../../source/blender/blenlib"
+)
add_library(bli_lib
- "../../../source/blender/blenlib/intern/fileops.c"
- "../../../source/blender/blenlib/intern/gsqueue.c"
- "../../../source/blender/blenlib/intern/rct.c"
- "../../../source/blender/blenlib/intern/string.c"
- "../../../source/blender/blenlib/intern/string_utf8.c"
- "../../../source/blender/blenlib/intern/listbase.c"
- "../../../source/blender/blenlib/intern/math_color.c"
- "../../../source/blender/blenlib/intern/storage.c"
- "../../../source/blender/blenlib/intern/task.c"
- "../../../source/blender/blenlib/intern/threads.c"
- "../../../source/blender/blenlib/intern/time.c"
- "../../../source/blender/blenlib/intern/path_util.c"
- "../../../source/blender/blenlib/intern/BLI_dynstr.c"
- "../../../source/blender/blenlib/intern/BLI_linklist.c"
- "../../../source/blender/blenlib/intern/BLI_memarena.c"
- "../../../source/blender/blenlib/intern/BLI_mempool.c"
- "../../../source/blender/blenlib/intern/system.c"
- )
+ "../../../source/blender/blenlib/intern/fileops.c"
+ "../../../source/blender/blenlib/intern/gsqueue.c"
+ "../../../source/blender/blenlib/intern/rct.c"
+ "../../../source/blender/blenlib/intern/string.c"
+ "../../../source/blender/blenlib/intern/string_utf8.c"
+ "../../../source/blender/blenlib/intern/listbase.c"
+ "../../../source/blender/blenlib/intern/math_color.c"
+ "../../../source/blender/blenlib/intern/storage.c"
+ "../../../source/blender/blenlib/intern/task.c"
+ "../../../source/blender/blenlib/intern/threads.c"
+ "../../../source/blender/blenlib/intern/time.c"
+ "../../../source/blender/blenlib/intern/path_util.c"
+ "../../../source/blender/blenlib/intern/BLI_dynstr.c"
+ "../../../source/blender/blenlib/intern/BLI_linklist.c"
+ "../../../source/blender/blenlib/intern/BLI_memarena.c"
+ "../../../source/blender/blenlib/intern/BLI_mempool.c"
+ "../../../source/blender/blenlib/intern/system.c"
+)
set(PLATFORM_CGLAGS)
diff --git a/intern/quadriflow/CMakeLists.txt b/intern/quadriflow/CMakeLists.txt
index 615d5a34ce6..35cfe22a018 100644
--- a/intern/quadriflow/CMakeLists.txt
+++ b/intern/quadriflow/CMakeLists.txt
@@ -38,7 +38,7 @@ set(LIB
extern_quadriflow
)
-if (WIN32)
+if(WIN32)
add_definitions(-D_USE_MATH_DEFINES)
endif()
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index cb76aa94df3..50b4f3edfa9 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -854,7 +854,7 @@ elseif(WIN32)
)
endif()
elseif(APPLE)
- if (NOT WITH_PYTHON_MODULE)
+ if(NOT WITH_PYTHON_MODULE)
# Uppercase name for app bundle
set_target_properties(blender PROPERTIES OUTPUT_NAME Blender)
endif()
@@ -1042,7 +1042,7 @@ setup_liblinks(blender)
# vcpkg substitutes our libs with theirs, which will cause issues when you
# you run these builds on other systems due to missing dlls. So we opt out
# the use of vcpkg
-if (WIN32)
+if(WIN32)
set_target_properties(blender PROPERTIES VS_GLOBAL_VcpkgEnabled "false")
endif()
More information about the Bf-blender-cvs
mailing list