From e1f5b2b4c11a5081704e889c1800383868f6f855 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sat, 6 Feb 2016 15:03:32 +0100 Subject: Fix GTests compilations on Windows Unfortunately this doesn't make all tests compilable due to all sort of weird and wonderful bad levels includes on Windows (G referenced from bf_blenlib) but at least allows to selectively build tests for now. --- build_files/cmake/Modules/GTestTesting.cmake | 1 + tests/gtests/testing/CMakeLists.txt | 3 +++ 2 files changed, 4 insertions(+) diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake index 16882a683a3..3ccca1f199c 100644 --- a/build_files/cmake/Modules/GTestTesting.cmake +++ b/build_files/cmake/Modules/GTestTesting.cmake @@ -29,6 +29,7 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST) add_executable(${NAME}_test ${SRC}) target_link_libraries(${NAME}_test ${EXTRA_LIBS} + ${PLATFORM_LINKLIBS} bf_testing_main bf_intern_guardedalloc extern_gtest diff --git a/tests/gtests/testing/CMakeLists.txt b/tests/gtests/testing/CMakeLists.txt index 796f975ea65..1eb60e7f3b5 100644 --- a/tests/gtests/testing/CMakeLists.txt +++ b/tests/gtests/testing/CMakeLists.txt @@ -47,4 +47,7 @@ set(SRC testing.h ) +add_definitions(${GFLAGS_DEFINES}) +add_definitions(${GLOG_DEFINES}) + blender_add_lib(bf_testing_main "${SRC}" "${INC}" "${INC_SYS}") -- cgit v1.2.3