diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 53b1228c..37d6c453 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 3.7) project(libtransport) set(CMAKE_CXX_STANDARD 11) +if(WIN32) + set(CMAKE_CXX_STANDARD 17) +endif(WIN32) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) @@ -165,10 +168,6 @@ if(NOT PROTOBUF_FOUND AND PROTOBUF_INCLUDE_DIR AND PROTOBUF_LIBRARY) endif() find_package(JsonCpp REQUIRED) -if(JSONCPP_FOUND) - include_directories(${JSONCPP_INCLUDE_DIRS}) - message(STATUS "Found jsoncpp: ${JSONCPP_INCLUDE_DIRS} ${JSONCPP_LIBRARY}, shared: ${JSONCPP_LIBRARY_IS_SHARED}") -endif() if(WIN32) add_definitions(-DSWIFTEN_STATIC=1) @@ -226,10 +225,10 @@ else(SPECTRUM_VERSION) OUTPUT_VARIABLE GIT_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE ) - set(SPECTRUM_VERSION 2.0.x-git-${GIT_REVISION}) + set(SPECTRUM_VERSION 2.1.x-git-${GIT_REVISION}) add_definitions(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}") else(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git) - set(SPECTRUM_VERSION 2.0.13) + set(SPECTRUM_VERSION 2.1.1) add_definitions(-DSPECTRUM_VERSION="${SPECTRUM_VERSION}") endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git) endif(SPECTRUM_VERSION) |