From 892a5f81761c260aec2a34240601cb27b37ff4b4 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 18 Sep 2022 11:21:25 +0200 Subject: Build: disable gtests entirely for Python module To avoid test failure on Windows. --- CMakeLists.txt | 5 +++++ build_files/cmake/macros.cmake | 14 -------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85e2a1450d8..b6f9046a883 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1272,6 +1272,11 @@ endif() if(WITH_PYTHON_MODULE) add_definitions(-DPy_ENABLE_SHARED) + # Not currently supported due to different required Python link flags. + if(WITH_GTESTS) + message(STATUS "GTests not compatible with Python module, disabling WITH_GTESTS") + set(WITH_GTESTS OFF) + endif() endif() diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 093106fc4dc..d271d8f216f 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -418,13 +418,6 @@ function(blender_add_test_lib library_deps ) - # Not currently supported for Python module due to different required - # Python link flags. - if(WITH_PYTHON_MODULE) - add_custom_target(${name}) - return() - endif() - add_cc_flags_custom_test(${name} PARENT_SCOPE) # Otherwise external projects will produce warnings that we cannot fix. @@ -471,13 +464,6 @@ function(blender_add_test_executable library_deps ) - # Not currently supported for Python module due to different required - # Python link flags. - if(WITH_PYTHON_MODULE) - add_custom_target(${name}) - return() - endif() - add_cc_flags_custom_test(${name} PARENT_SCOPE) ## Otherwise external projects will produce warnings that we cannot fix. -- cgit v1.2.3