Cleanup: add missing headers to CMake, formatting
This commit is contained in:
@@ -57,7 +57,7 @@ if(WITH_CYCLES_NATIVE_ONLY)
|
||||
COMPILE_OUTPUT_VARIABLE arch_compile_output
|
||||
RUN_OUTPUT_VARIABLE arch_run_output
|
||||
)
|
||||
if (arch_compile_result AND "${arch_run_result}" EQUAL "0")
|
||||
if(arch_compile_result AND "${arch_run_result}" EQUAL "0")
|
||||
string(STRIP ${arch_run_output} arch_run_output)
|
||||
set(MSVC_NATIVE_ARCH_FLAGS ${arch_run_output} CACHE STRING "MSVC Native architecture flags")
|
||||
endif()
|
||||
|
@@ -172,6 +172,8 @@ set(SRC
|
||||
engines/eevee/eevee_lut.h
|
||||
engines/eevee/eevee_private.h
|
||||
engines/external/external_engine.h
|
||||
engines/image/image_engine.h
|
||||
engines/image/image_private.h
|
||||
engines/workbench/workbench_engine.h
|
||||
engines/workbench/workbench_private.h
|
||||
engines/select/select_engine.h
|
||||
|
@@ -51,6 +51,7 @@ set(SRC
|
||||
../include/ED_curve.h
|
||||
../include/ED_datafiles.h
|
||||
../include/ED_fileselect.h
|
||||
../include/ED_geometry.h
|
||||
../include/ED_gizmo_library.h
|
||||
../include/ED_gizmo_utils.h
|
||||
../include/ED_gpencil.h
|
||||
|
@@ -68,7 +68,7 @@ if(WITH_GTESTS)
|
||||
tests/FN_multi_function_test.cc
|
||||
tests/FN_spans_test.cc
|
||||
)
|
||||
set (TEST_LIB
|
||||
set(TEST_LIB
|
||||
bf_functions
|
||||
)
|
||||
include(GTestTesting)
|
||||
|
@@ -116,6 +116,7 @@ set(SRC
|
||||
GPU_debug.h
|
||||
GPU_drawlist.h
|
||||
GPU_framebuffer.h
|
||||
GPU_glew.h
|
||||
GPU_immediate.h
|
||||
GPU_immediate_util.h
|
||||
GPU_index_buffer.h
|
||||
@@ -139,6 +140,7 @@ set(SRC
|
||||
intern/gpu_capabilities_private.hh
|
||||
intern/gpu_codegen.h
|
||||
intern/gpu_context_private.hh
|
||||
intern/gpu_debug_private.hh
|
||||
intern/gpu_drawlist_private.hh
|
||||
intern/gpu_framebuffer_private.hh
|
||||
intern/gpu_immediate_private.hh
|
||||
@@ -384,6 +386,8 @@ if(WITH_GTESTS)
|
||||
if(WITH_OPENGL_DRAW_TESTS)
|
||||
set(TEST_SRC
|
||||
tests/gpu_testing.cc
|
||||
|
||||
tests/gpu_testing.hh
|
||||
)
|
||||
set(TEST_INC
|
||||
"../../../intern/ghost/"
|
||||
|
@@ -1156,7 +1156,7 @@ if(WIN32)
|
||||
set_target_properties(blender PROPERTIES
|
||||
PDB_NAME "blender_private"
|
||||
PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")
|
||||
if (WITH_WINDOWS_PDB AND WITH_WINDOWS_STRIPPED_PDB)
|
||||
if(WITH_WINDOWS_PDB AND WITH_WINDOWS_STRIPPED_PDB)
|
||||
# This is slightly messy, but single target generators like ninja will not have the
|
||||
# CMAKE_CFG_INTDIR variable and multitarget generators like msbuild will not have
|
||||
# CMAKE_BUILD_TYPE. This can be simplified by target_link_options and the $<CONFIG>
|
||||
|
@@ -30,7 +30,7 @@ endif()
|
||||
# The installation directory's Python is the best one to use. However, it can only be there after the install step,
|
||||
# which means that Python will never be there on a fresh system. To suit different needs, the user can pass
|
||||
# -DTEST_PYTHON_EXE=/path/to/python to CMake.
|
||||
if (NOT TEST_PYTHON_EXE)
|
||||
if(NOT TEST_PYTHON_EXE)
|
||||
set(TEST_PYTHON_EXE ${_default_test_python_exe})
|
||||
message(STATUS "Tests: Using Python executable: ${TEST_PYTHON_EXE}")
|
||||
elseif(NOT EXISTS ${TEST_PYTHON_EXE})
|
||||
|
Reference in New Issue
Block a user