gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve code changes from origin repository

Browse Source
This commit is contained in:
Jerry Turcios 2018-10-02 22:12:06 -04:00
commit 77e0cd75b9
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -6,6 +6,11 @@ endif (POLICY CMP0048)
project(googletest-distribution) project(googletest-distribution)
set(GOOGLETEST_VERSION 1.9.0) set(GOOGLETEST_VERSION 1.9.0)
<<<<<<< HEAD
=======
add_compile_options(-std=c++11)
>>>>>>> 1e893191c0a72f6c94bbd69acc39ce425594f36d
enable_testing() enable_testing()