[Bf-blender-cvs] [7dfa2c281c4] sybren-usd: FIXUP for EXTRA_CLI
Sybren A. Stüvel
noreply at git.blender.org
Thu Nov 21 10:35:57 CET 2019
Commit: 7dfa2c281c4052dd257e5e6047b3ae2bc211cff1
Author: Sybren A. Stüvel
Date: Wed Nov 13 16:31:39 2019 +0100
Branches: sybren-usd
https://developer.blender.org/rB7dfa2c281c4052dd257e5e6047b3ae2bc211cff1
FIXUP for EXTRA_CLI
===================================================================
M build_files/cmake/Modules/GTestTesting.cmake
===================================================================
diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake
index b7164690096..1d5c40e2e85 100644
--- a/build_files/cmake/Modules/GTestTesting.cmake
+++ b/build_files/cmake/Modules/GTestTesting.cmake
@@ -16,8 +16,8 @@ macro(BLENDER_SRC_GTEST_EX)
if(WITH_GTESTS)
# See https://cmake.org/cmake/help/v3.5/command/cmake_parse_arguments.html
set(options SKIP_ADD_TEST)
- set(oneValueArgs NAME EXTRA_CLI)
- set(multiValueArgs SRC EXTRA_LIBS)
+ set(oneValueArgs NAME)
+ set(multiValueArgs SRC EXTRA_LIBS EXTRA_CLI)
cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
set(TARGET_NAME ${ARG_NAME}_test)
@@ -69,7 +69,7 @@ macro(BLENDER_SRC_GTEST_EX)
if(NOT ARG_SKIP_ADD_TEST)
add_test(
NAME ${TARGET_NAME}
- COMMAND ${TESTS_OUTPUT_DIR}/${TARGET_NAME} ${EXTRA_CLI}
+ COMMAND ${TESTS_OUTPUT_DIR}/${TARGET_NAME} ${ARG_EXTRA_CLI}
WORKING_DIRECTORY ${TEST_INSTALL_DIR})
# Don't fail tests on leaks since these often happen in external libraries
More information about the Bf-blender-cvs
mailing list