diff options
| author | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-02 23:43:01 -0400 |
|---|---|---|
| committer | Jerry Turcios <jerryturcios08@gmail.com> | 2018-10-02 23:43:01 -0400 |
| commit | 9f8512d7c53df3bfb6668aa5ee503b11380ae62b (patch) | |
| tree | d1ef53caf66c1299d06ac0677b22fbbfef291d8f | |
| parent | 77e0cd75b997d0de836589c9cbd74c8529b657cc (diff) | |
| download | googletest-9f8512d7c53df3bfb6668aa5ee503b11380ae62b.tar.gz googletest-9f8512d7c53df3bfb6668aa5ee503b11380ae62b.tar.bz2 googletest-9f8512d7c53df3bfb6668aa5ee503b11380ae62b.zip | |
Remove compilation option for C++11 in the root CMakeLists.txt
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b498cfe..d7732116 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,11 +6,6 @@ endif (POLICY CMP0048) project(googletest-distribution) set(GOOGLETEST_VERSION 1.9.0) -<<<<<<< HEAD -======= - -add_compile_options(-std=c++11) ->>>>>>> 1e893191c0a72f6c94bbd69acc39ce425594f36d enable_testing() |