Cleanup: style
This commit is contained in:
@@ -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})
|
||||||
|
68
extern/quadriflow/CMakeLists.txt
vendored
68
extern/quadriflow/CMakeLists.txt
vendored
@@ -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
|
||||||
@@ -71,37 +71,37 @@ set(INC_SYS
|
|||||||
)
|
)
|
||||||
|
|
||||||
set(SRC
|
set(SRC
|
||||||
src/adjacent-matrix.cpp
|
src/adjacent-matrix.cpp
|
||||||
src/adjacent-matrix.hpp
|
src/adjacent-matrix.hpp
|
||||||
src/compare-key.hpp
|
src/compare-key.hpp
|
||||||
src/config.hpp
|
src/config.hpp
|
||||||
src/dedge.cpp
|
src/dedge.cpp
|
||||||
src/dedge.hpp
|
src/dedge.hpp
|
||||||
src/disajoint-tree.hpp
|
src/disajoint-tree.hpp
|
||||||
src/dset.hpp
|
src/dset.hpp
|
||||||
src/field-math.hpp
|
src/field-math.hpp
|
||||||
src/flow.hpp
|
src/flow.hpp
|
||||||
src/hierarchy.cpp
|
src/hierarchy.cpp
|
||||||
src/hierarchy.hpp
|
src/hierarchy.hpp
|
||||||
src/loader.cpp
|
src/loader.cpp
|
||||||
src/loader.hpp
|
src/loader.hpp
|
||||||
src/localsat.cpp
|
src/localsat.cpp
|
||||||
src/localsat.hpp
|
src/localsat.hpp
|
||||||
src/merge-vertex.cpp
|
src/merge-vertex.cpp
|
||||||
src/merge-vertex.hpp
|
src/merge-vertex.hpp
|
||||||
src/optimizer.cpp
|
src/optimizer.cpp
|
||||||
src/optimizer.hpp
|
src/optimizer.hpp
|
||||||
src/parametrizer.cpp
|
src/parametrizer.cpp
|
||||||
src/parametrizer-flip.cpp
|
src/parametrizer-flip.cpp
|
||||||
src/parametrizer-int.cpp
|
src/parametrizer-int.cpp
|
||||||
src/parametrizer-mesh.cpp
|
src/parametrizer-mesh.cpp
|
||||||
src/parametrizer-scale.cpp
|
src/parametrizer-scale.cpp
|
||||||
src/parametrizer-sing.cpp
|
src/parametrizer-sing.cpp
|
||||||
src/parametrizer.hpp
|
src/parametrizer.hpp
|
||||||
src/serialize.hpp
|
src/serialize.hpp
|
||||||
src/subdivide.cpp
|
src/subdivide.cpp
|
||||||
src/subdivide.hpp
|
src/subdivide.hpp
|
||||||
${LEMON_SOURCES}
|
${LEMON_SOURCES}
|
||||||
)
|
)
|
||||||
|
|
||||||
set(LIB
|
set(LIB
|
||||||
|
@@ -126,27 +126,27 @@ 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"
|
||||||
"../../../source/blender/blenlib/intern/rct.c"
|
"../../../source/blender/blenlib/intern/rct.c"
|
||||||
"../../../source/blender/blenlib/intern/string.c"
|
"../../../source/blender/blenlib/intern/string.c"
|
||||||
"../../../source/blender/blenlib/intern/string_utf8.c"
|
"../../../source/blender/blenlib/intern/string_utf8.c"
|
||||||
"../../../source/blender/blenlib/intern/listbase.c"
|
"../../../source/blender/blenlib/intern/listbase.c"
|
||||||
"../../../source/blender/blenlib/intern/math_color.c"
|
"../../../source/blender/blenlib/intern/math_color.c"
|
||||||
"../../../source/blender/blenlib/intern/storage.c"
|
"../../../source/blender/blenlib/intern/storage.c"
|
||||||
"../../../source/blender/blenlib/intern/task.c"
|
"../../../source/blender/blenlib/intern/task.c"
|
||||||
"../../../source/blender/blenlib/intern/threads.c"
|
"../../../source/blender/blenlib/intern/threads.c"
|
||||||
"../../../source/blender/blenlib/intern/time.c"
|
"../../../source/blender/blenlib/intern/time.c"
|
||||||
"../../../source/blender/blenlib/intern/path_util.c"
|
"../../../source/blender/blenlib/intern/path_util.c"
|
||||||
"../../../source/blender/blenlib/intern/BLI_dynstr.c"
|
"../../../source/blender/blenlib/intern/BLI_dynstr.c"
|
||||||
"../../../source/blender/blenlib/intern/BLI_linklist.c"
|
"../../../source/blender/blenlib/intern/BLI_linklist.c"
|
||||||
"../../../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)
|
||||||
|
|
||||||
|
@@ -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()
|
||||||
|
|
||||||
|
@@ -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()
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user