diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2022-10-30 00:41:21 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2022-10-30 01:14:59 +0300 |
| commit | bc37e8d8399eef686b71341aa90eced9bc117786 (patch) | |
| tree | 92e4af388150209df9bc44e2cba6f2f303aa7baf /build_files/cmake/Modules/GTestTesting.cmake | |
| parent | 552abb838c76d44a0d7d1226b59a1ab381e88386 (diff) | |
| parent | d1d2f002c7caaf4ab457ec27bbc44666d7aac624 (diff) | |
Merge remote-tracking branch 'origin/master' into principled-v2
Diffstat (limited to 'build_files/cmake/Modules/GTestTesting.cmake')
| -rw-r--r-- | build_files/cmake/Modules/GTestTesting.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake index 92ce403d5f3..5ffd158361e 100644 --- a/build_files/cmake/Modules/GTestTesting.cmake +++ b/build_files/cmake/Modules/GTestTesting.cmake @@ -40,12 +40,10 @@ macro(BLENDER_SRC_GTEST_EX) set(MANIFEST "${CMAKE_BINARY_DIR}/tests.exe.manifest") endif() - add_definitions(-DBLENDER_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE}) - add_definitions(${GFLAGS_DEFINES}) - add_definitions(${GLOG_DEFINES}) - add_executable(${TARGET_NAME} ${ARG_SRC} ${MANIFEST}) setup_platform_linker_flags(${TARGET_NAME}) + target_compile_definitions(${TARGET_NAME} PRIVATE ${GFLAGS_DEFINES}) + target_compile_definitions(${TARGET_NAME} PRIVATE ${GLOG_DEFINES}) target_include_directories(${TARGET_NAME} PUBLIC "${TEST_INC}") target_include_directories(${TARGET_NAME} SYSTEM PUBLIC "${TEST_INC_SYS}") target_link_libraries(${TARGET_NAME} ${ARG_EXTRA_LIBS} ${PLATFORM_LINKLIBS}) |