Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2019-10-21 15:05:56 +11:00
parent 3ceff8b7bc
commit 41ec25d27b
5 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/build_environment/cmake/theora.cmake
View File

@@ -16,7 +16,7 @@
# #
# ***** END GPL LICENSE BLOCK ***** # ***** END GPL LICENSE BLOCK *****
if (UNIX) if(UNIX)
set(THEORA_CONFIGURE_ENV ${CONFIGURE_ENV} && export HAVE_PDFLATEX=no) set(THEORA_CONFIGURE_ENV ${CONFIGURE_ENV} && export HAVE_PDFLATEX=no)
else() else()
set(THEORA_CONFIGURE_ENV ${CONFIGURE_ENV}) set(THEORA_CONFIGURE_ENV ${CONFIGURE_ENV})

6
extern/quadriflow/CMakeLists.txt vendored
View File

@@ -31,7 +31,7 @@ endif()
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
if (WIN32) if(WIN32)
add_definitions(-D_USE_MATH_DEFINES) add_definitions(-D_USE_MATH_DEFINES)
endif() endif()
@@ -46,7 +46,7 @@ set(LEMON_GEN_DIR ${CMAKE_BINARY_DIR}/extern/quadriflow/${LEMON_3RD_PATH})
configure_file( configure_file(
${LEMON_SRC}/config.h.in ${LEMON_SRC}/config.h.in
${LEMON_GEN_DIR}/lemon/config.h ${LEMON_GEN_DIR}/lemon/config.h
) )
set(LEMON_SOURCES set(LEMON_SOURCES
${LEMON_SRC}/arg_parser.cc ${LEMON_SRC}/arg_parser.cc
${LEMON_SRC}/base.cc ${LEMON_SRC}/base.cc
@@ -55,7 +55,7 @@ set(LEMON_SOURCES
${LEMON_SRC}/lp_skeleton.cc ${LEMON_SRC}/lp_skeleton.cc
${LEMON_SRC}/random.cc ${LEMON_SRC}/random.cc
${LEMON_SRC}/bits/windows.cc ${LEMON_SRC}/bits/windows.cc
) )
set(INC set(INC
src src

4
intern/ghost/test/CMakeLists.txt
View File

@@ -127,7 +127,7 @@ add_library(glewmx_lib ${SRC_NEW})
# grr, blenfont needs BLI # grr, blenfont needs BLI
include_directories( include_directories(
"../../../source/blender/blenlib" "../../../source/blender/blenlib"
) )
add_library(bli_lib add_library(bli_lib
"../../../source/blender/blenlib/intern/fileops.c" "../../../source/blender/blenlib/intern/fileops.c"
"../../../source/blender/blenlib/intern/gsqueue.c" "../../../source/blender/blenlib/intern/gsqueue.c"
@@ -146,7 +146,7 @@ add_library(bli_lib
"../../../source/blender/blenlib/intern/BLI_memarena.c" "../../../source/blender/blenlib/intern/BLI_memarena.c"
"../../../source/blender/blenlib/intern/BLI_mempool.c" "../../../source/blender/blenlib/intern/BLI_mempool.c"
"../../../source/blender/blenlib/intern/system.c" "../../../source/blender/blenlib/intern/system.c"
) )
set(PLATFORM_CGLAGS) set(PLATFORM_CGLAGS)

2
intern/quadriflow/CMakeLists.txt
View File

@@ -38,7 +38,7 @@ set(LIB
extern_quadriflow extern_quadriflow
) )
if (WIN32) if(WIN32)
add_definitions(-D_USE_MATH_DEFINES) add_definitions(-D_USE_MATH_DEFINES)
endif() endif()

4
source/creator/CMakeLists.txt
View File

@@ -854,7 +854,7 @@ elseif(WIN32)
) )
endif() endif()
elseif(APPLE) elseif(APPLE)
if (NOT WITH_PYTHON_MODULE) if(NOT WITH_PYTHON_MODULE)
# Uppercase name for app bundle # Uppercase name for app bundle
set_target_properties(blender PROPERTIES OUTPUT_NAME Blender) set_target_properties(blender PROPERTIES OUTPUT_NAME Blender)
endif() endif()
@@ -1042,7 +1042,7 @@ setup_liblinks(blender)
# vcpkg substitutes our libs with theirs, which will cause issues when you # 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 # you run these builds on other systems due to missing dlls. So we opt out
# the use of vcpkg # the use of vcpkg
if (WIN32) if(WIN32)
set_target_properties(blender PROPERTIES VS_GLOBAL_VcpkgEnabled "false") set_target_properties(blender PROPERTIES VS_GLOBAL_VcpkgEnabled "false")
endif() endif()