Skip to content

Commit

Permalink
Merge pull request #143 from tgockel/issue/140/remove-cxx17-redundancies
Browse files Browse the repository at this point in the history
Removes redundant implementations of C++17 classes.
  • Loading branch information
tgockel authored Feb 22, 2020
2 parents d2473ea + 54e6043 commit 526dec2
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 552 deletions.
50 changes: 1 addition & 49 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# File: CMakeLists used for generating a Makefile (or whatever your build system is).
#
# Copyright 2015-2018 by Travis Gockel
# Copyright 2015-2020 by Travis Gockel
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
Expand Down Expand Up @@ -53,54 +53,6 @@ option(JSONV_BUILD_TESTS
OFF
)

#############################
# String View Configuration #
#############################

option(USE_BOOST_STRING_VIEW
"Controls the variable JSONV_STRING_VIEW_USE_BOOST (see C++ documentation)."
OFF
)
if (USE_BOOST_STRING_VIEW)
add_definitions("-DJSONV_STRING_VIEW_USE_BOOST=1")
endif(USE_BOOST_STRING_VIEW)

option(USE_STD_STRING_VIEW
"Controls the variable JSONV_STRING_VIEW_USE_STD (see C++ documentation)."
OFF
)
if (USE_STD_STRING_VIEW)
add_definitions("-DJSONV_STRING_VIEW_USE_STD=1")
endif(USE_STD_STRING_VIEW)

##########################
# Optional Configuration #
##########################

option(USE_STD_OPTIONAL
"Controls the variable JSONV_OPTIONAL_USE_STD (see C++ documentation)."
OFF
)
if (USE_STD_OPTIONAL)
add_definitions("-DJSONV_OPTIONAL_USE_STD=1")
endif()

option(USE_STD_EXPERIMENTAL_OPTIONAL
"Controls the variable JSONV_OPTIONAL_USE_STD_EXPERIMENTAL (see C++ documentation)."
OFF
)
if (USE_STD_EXPERIMENTAL_OPTIONAL)
add_definitions("-DJSONV_OPTIONAL_USE_STD_EXPERIMENTAL=1")
endif()

option(USE_BOOST_OPTIONAL
"Controls the variable JSONV_OPTIONAL_USE_BOOST (see C++ documentation)."
OFF
)
if (USE_BOOST_OPTIONAL)
add_definitions("-DJSONV_OPTIONAL_USE_BOOST=1")
endif()

##########################
# Coverage Configuration #
##########################
Expand Down
Loading

0 comments on commit 526dec2

Please sign in to comment.