Skip to content

Commit f817cf7

Browse files
committed
set std to c++14 and update to gmock 1.8.0.
1 parent ec4940f commit f817cf7

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ include(CTest)
3131
# gmock
3232
ExternalProject_Add(
3333
gmock
34-
URL ${CMAKE_CURRENT_SOURCE_DIR}/googletest-master-20160722.zip
34+
URL ${CMAKE_CURRENT_SOURCE_DIR}/googletest-release-1.8.0.zip
3535
INSTALL_COMMAND ""
3636
)
3737

@@ -55,7 +55,7 @@ ExternalProject_Add(
5555
find_package(Threads)
5656

5757
# Common configuration for all build modes.
58-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
58+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
5959
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -Werror -Woverloaded-virtual")
6060
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -momit-leaf-frame-pointer")
6161

README.md

-8
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@ Install `folly`:
1919
brew install folly
2020
```
2121

22-
After first checkout, initialize and update submodules:
23-
24-
```
25-
# inside root ./reactivesocket-cpp
26-
git submodule init
27-
git submodule update --recursive
28-
```
29-
3022
# Building and running tests
3123

3224
After installing dependencies as above, you can build and run tests with:
Binary file not shown.

0 commit comments

Comments
 (0)