diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-06 17:03:32 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-06 17:12:28 +0300 |
commit | e1f5b2b4c11a5081704e889c1800383868f6f855 (patch) | |
tree | 3d328203ff18a77c59037685d6243c12958737c6 | |
parent | d978f23f718d67bbae8b90d88361874fec9797ec (diff) |
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.
-rw-r--r-- | build_files/cmake/Modules/GTestTesting.cmake | 1 | ||||
-rw-r--r-- | tests/gtests/testing/CMakeLists.txt | 3 |
2 files changed, 4 insertions, 0 deletions
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}") |