[Bf-blender-cvs] [2c68d504211] master: CMake: Cleanup, unset temporary variables

Sergey Sharybin noreply at git.blender.org
Mon Sep 2 09:42:55 CEST 2019


Commit: 2c68d50421134d0522e7f5ee24c6ecaeceec6d75
Author: Sergey Sharybin
Date:   Wed Aug 28 16:29:02 2019 +0200
Branches: master
https://developer.blender.org/rB2c68d50421134d0522e7f5ee24c6ecaeceec6d75

CMake: Cleanup, unset temporary variables

Was happening in macros, polluting the namespace.

No functional changes, just making things cleaner.

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

M	build_files/cmake/Modules/GTestTesting.cmake

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

diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake
index 47edbdf37a6..0327a369f0a 100644
--- a/build_files/cmake/Modules/GTestTesting.cmake
+++ b/build_files/cmake/Modules/GTestTesting.cmake
@@ -55,6 +55,8 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST)
       # that we can't fix.
       set_tests_properties(${NAME}_test PROPERTIES ENVIRONMENT LSAN_OPTIONS=exitcode=0)
     endif()
+    unset(TEST_INC)
+    unset(TEST_INC_SYS)
   endif()
 endmacro()



More information about the Bf-blender-cvs mailing list