diff options
| author | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-02 22:12:06 -0400 |
|---|---|---|
| committer | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-02 22:12:06 -0400 |
| commit | 77e0cd75b997d0de836589c9cbd74c8529b657cc (patch) | |
| tree | 2460baaff5f72edb9ce45c9108341db327aa2bf2 | |
| parent | f5260ae757a681566d8f7d0558b8dc0551036506 (diff) | |
| parent | 1e893191c0a72f6c94bbd69acc39ce425594f36d (diff) | |
| download | googletest-77e0cd75b997d0de836589c9cbd74c8529b657cc.tar.gz googletest-77e0cd75b997d0de836589c9cbd74c8529b657cc.tar.bz2 googletest-77e0cd75b997d0de836589c9cbd74c8529b657cc.zip | |
Resolve code changes from origin repository
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d7732116..2b498cfe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,11 @@ endif (POLICY CMP0048) project(googletest-distribution) set(GOOGLETEST_VERSION 1.9.0) +<<<<<<< HEAD +======= + +add_compile_options(-std=c++11) +>>>>>>> 1e893191c0a72f6c94bbd69acc39ce425594f36d enable_testing() |