Removed global directives
This commit is contained in:
parent
6b0719a667
commit
398da6b979
@ -40,12 +40,6 @@ foreach(pold "") # Currently Empty
|
|||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
# Build the library with C++11 standard support, independent from other including
|
|
||||||
# software which may use a different CXX_STANDARD or CMAKE_CXX_STANDARD.
|
|
||||||
set(CMAKE_CXX_STANDARD 11)
|
|
||||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
||||||
|
|
||||||
# Ensure that CMAKE_BUILD_TYPE has a value specified for single configuration generators.
|
# Ensure that CMAKE_BUILD_TYPE has a value specified for single configuration generators.
|
||||||
if(NOT DEFINED CMAKE_BUILD_TYPE AND NOT DEFINED CMAKE_CONFIGURATION_TYPES)
|
if(NOT DEFINED CMAKE_BUILD_TYPE AND NOT DEFINED CMAKE_CONFIGURATION_TYPES)
|
||||||
set(CMAKE_BUILD_TYPE Release CACHE STRING
|
set(CMAKE_BUILD_TYPE Release CACHE STRING
|
||||||
@ -117,9 +111,6 @@ macro(use_compilation_warning_as_error)
|
|||||||
endif()
|
endif()
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
# Include our configuration header
|
|
||||||
include_directories(${jsoncpp_SOURCE_DIR}/include)
|
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
# Only enabled in debug because some old versions of VS STL generate
|
# Only enabled in debug because some old versions of VS STL generate
|
||||||
# unreachable code warning when compiled in release configuration.
|
# unreachable code warning when compiled in release configuration.
|
||||||
|
Loading…
Reference in New Issue
Block a user