diff options
-rw-r--r-- | build_files/build_environment/cmake/pugixml.cmake | 4 | ||||
-rw-r--r-- | intern/cycles/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/draw/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/editors/util/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/functions/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/gpu/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 2 |
8 files changed, 13 insertions, 6 deletions
diff --git a/build_files/build_environment/cmake/pugixml.cmake b/build_files/build_environment/cmake/pugixml.cmake index 8804ae74836..4e0bd0eafcf 100644 --- a/build_files/build_environment/cmake/pugixml.cmake +++ b/build_files/build_environment/cmake/pugixml.cmake @@ -39,5 +39,5 @@ if(WIN32) COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/osl/lib/pugixml_d.lib DEPENDEES install ) - endif() -endif()
\ No newline at end of file + endif() +endif() diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index d114820d723..f420b1faf81 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -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() diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 1344d390871..af264365c25 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -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 diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index e05d1fedf6d..b09676fa547 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -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 diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt index ad29dbe6668..9a6b6f4a4db 100644 --- a/source/blender/functions/CMakeLists.txt +++ b/source/blender/functions/CMakeLists.txt @@ -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) diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index b763ea2a528..2dd61a3548b 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -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/" diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 2798cec8c58..43f77556ba1 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -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> diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8f72db07d92..8941cc671dd 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -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}) |