diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-06-18 14:23:12 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-06-19 13:02:21 +0300 |
| commit | 8c3dd6d83df467f3b8e53b6c97545eabf07768be (patch) | |
| tree | 1ec635e9cea07b23f0774d2ababa5c0a4ffbce57 /extern/gmock/CMakeLists.txt | |
| parent | 0f78a579047ec8946021ca58b8ee48f7486e6605 (diff) | |
Upgrade Google libraries
Upgrades Glog from 0.3.5 to 0.4.0, and Gtest from 0.8.0 to 0.10.0.
Hopefully this will solve compilation error on MSVC with C++17.
Diffstat (limited to 'extern/gmock/CMakeLists.txt')
| -rw-r--r-- | extern/gmock/CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/extern/gmock/CMakeLists.txt b/extern/gmock/CMakeLists.txt index 73e524d80cd..faa133265d3 100644 --- a/extern/gmock/CMakeLists.txt +++ b/extern/gmock/CMakeLists.txt @@ -29,33 +29,34 @@ set(INC_SYS set(SRC # src/gmock-all.cc + # src/gmock_main.cc - src/gmock-cardinalities.cc src/gmock.cc + src/gmock-cardinalities.cc src/gmock-internal-utils.cc - src/gmock_main.cc src/gmock-matchers.cc src/gmock-spec-builders.cc ) set(SRC_HEADERS + include/gmock/gmock.h include/gmock/gmock-actions.h include/gmock/gmock-cardinalities.h + include/gmock/gmock-function-mocker.h include/gmock/gmock-generated-actions.h include/gmock/gmock-generated-function-mockers.h include/gmock/gmock-generated-matchers.h - include/gmock/gmock-generated-nice-strict.h - include/gmock/gmock.h include/gmock/gmock-matchers.h include/gmock/gmock-more-actions.h include/gmock/gmock-more-matchers.h + include/gmock/gmock-nice-strict.h include/gmock/gmock-spec-builders.h include/gmock/internal/custom/gmock-generated-actions.h include/gmock/internal/custom/gmock-matchers.h include/gmock/internal/custom/gmock-port.h - include/gmock/internal/gmock-generated-internal-utils.h include/gmock/internal/gmock-internal-utils.h include/gmock/internal/gmock-port.h + include/gmock/internal/gmock-pp.h ) include_directories(${INC}) |