[Bf-blender-cvs] [04562794df9] temp_bmesh_multires: Sculpt dyntopo: disable mem cache test executable from compiling altogether

Joseph Eagar noreply at git.blender.org
Sat Aug 21 05:52:48 CEST 2021


Commit: 04562794df9509ecf49ba76fedacfc8bb97c9b1f
Author: Joseph Eagar
Date:   Fri Aug 20 20:52:22 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rB04562794df9509ecf49ba76fedacfc8bb97c9b1f

Sculpt dyntopo: disable mem cache test executable
from compiling altogether

===================================================================

M	source/blender/blenkernel/CMakeLists.txt

===================================================================

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 953e670e892..b841777de3a 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -794,73 +794,74 @@ if(WITH_GTESTS)
   blender_add_test_lib(bf_blenkernel_tests "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB}")
 endif()
 
-
-set(PBVH_CACHE_TEST_INC
-  .
-  ../blenfont
-  ../blenlib
-  ../blenloader
-  ../blentranslation
-  ../bmesh
-  ../depsgraph
-  ../draw
-  ../functions
-  ../gpencil_modifiers
-  ../gpu
-  ../ikplugin
-  ../imbuf
-  ../makesdna
-  ../makesrna
-  ../modifiers
-  ../nodes
-  ../render
-  ../sequencer
-  ../shader_fx
-  ../simulation
-  ../../../intern/eigen
-  ../../../intern/ghost
-  ../../../intern/glew-mx
-  ../../../intern/guardedalloc
-  ../../../intern/iksolver/extern
-  ../../../intern/atomic
-  ../../../intern/clog
-  ../../../intern/libmv
-  ../../../intern/mantaflow/extern
-  ../../../intern/memutil
-  ../../../intern/mikktspace
-  ../../../intern/opensubdiv
-  ../../../extern/curve_fit_nd
-)
-
-set(PBVH_CACHE_TEST_SRC
-  intern/pbvh_cache_test_main.c
-)
-
-setup_libdirs()
-
-add_executable(pbvh_cache_test ${PBVH_CACHE_TEST_SRC} ${PBVH_CACHE_TEST_INC})
-setup_platform_linker_flags(pbvh_cache_test)
-
-target_link_libraries(pbvh_cache_test bf_blenkernel bf_bmesh bf_intern_ghost bf_blenlib bf_intern_guardedalloc)
-
-if(WIN32)
-  set_target_properties(pbvh_cache_test PROPERTIES VS_GLOBAL_VcpkgEnabled "false")
-  set_target_properties(pbvh_cache_test PROPERTIES
-    PDB_NAME "pbvh_cache_test_private"
-    PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")
-    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>
-      # generator expression in newer cmake (2.13+) but until that time this fill have suffice.
-      if(CMAKE_BUILD_TYPE)
-        set_property(TARGET pbvh_cache_test APPEND_STRING PROPERTY LINK_FLAGS  " /PDBSTRIPPED:${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/pbvh_cache_test_public.pdb")
-      else()
-        set_property(TARGET pbvh_cache_test APPEND_STRING PROPERTY LINK_FLAGS  " /PDBSTRIPPED:${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/pbvh_cache_test_public.pdb")
-      endif()
+if(false)
+  set(PBVH_CACHE_TEST_INC
+    .
+    ../blenfont
+    ../blenlib
+    ../blenloader
+    ../blentranslation
+    ../bmesh
+    ../depsgraph
+    ../draw
+    ../functions
+    ../gpencil_modifiers
+    ../gpu
+    ../ikplugin
+    ../imbuf
+    ../makesdna
+    ../makesrna
+    ../modifiers
+    ../nodes
+    ../render
+    ../sequencer
+    ../shader_fx
+    ../simulation
+    ../../../intern/eigen
+    ../../../intern/ghost
+    ../../../intern/glew-mx
+    ../../../intern/guardedalloc
+    ../../../intern/iksolver/extern
+    ../../../intern/atomic
+    ../../../intern/clog
+    ../../../intern/libmv
+    ../../../intern/mantaflow/extern
+    ../../../intern/memutil
+    ../../../intern/mikktspace
+    ../../../intern/opensubdiv
+    ../../../extern/curve_fit_nd
+  )
+
+  set(PBVH_CACHE_TEST_SRC
+    intern/pbvh_cache_test_main.c
+  )
+
+  setup_libdirs()
+
+  add_executable(pbvh_cache_test ${PBVH_CACHE_TEST_SRC} ${PBVH_CACHE_TEST_INC})
+  setup_platform_linker_flags(pbvh_cache_test)
+
+  target_link_libraries(pbvh_cache_test bf_blenkernel bf_bmesh bf_intern_ghost bf_blenlib bf_intern_guardedalloc)
+
+  if(WIN32)
+    set_target_properties(pbvh_cache_test PROPERTIES VS_GLOBAL_VcpkgEnabled "false")
+    set_target_properties(pbvh_cache_test PROPERTIES
+      PDB_NAME "pbvh_cache_test_private"
+      PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")
+      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>
+        # generator expression in newer cmake (2.13+) but until that time this fill have suffice.
+        if(CMAKE_BUILD_TYPE)
+          set_property(TARGET pbvh_cache_test APPEND_STRING PROPERTY LINK_FLAGS  " /PDBSTRIPPED:${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/pbvh_cache_test_public.pdb")
+        else()
+          set_property(TARGET pbvh_cache_test APPEND_STRING PROPERTY LINK_FLAGS  " /PDBSTRIPPED:${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/pbvh_cache_test_public.pdb")
+        endif()
+    endif()
   endif()
-endif()
 
-if (WIN32)
-target_link_libraries(pbvh_cache_test Vfw32.lib Imm32.lib Version.lib Comctl32.lib Shcore.lib Pathcch.lib)
+  if (WIN32)
+  target_link_libraries(pbvh_cache_test Vfw32.lib Imm32.lib Version.lib Comctl32.lib Shcore.lib Pathcch.lib)
+  endif()
 endif()



More information about the Bf-blender-cvs mailing list