Skip to content

Commit 349cba9

Browse files
committed
version 2.3.0
(and CMakeLists whitespace changes)
1 parent e3aa397 commit 349cba9

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

CMakeLists.txt

+19-19
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ endif ()
1212

1313
# TODO: Version 3, rename the project and namespace to something more compact
1414
project(nlohmann_json_schema_validator
15-
VERSION 2.2.0
15+
VERSION 2.3.0
1616
DESCRIPTION "Json validator for nlohmann::json library"
1717
HOMEPAGE_URL "https://github.com/pboettch/json-schema-validator"
1818
LANGUAGES CXX)
@@ -63,16 +63,16 @@ endif ()
6363
set(BUILD_SHARED_LIBS ${nlohmann_json_schema_validator_SHARED_LIBS})
6464

6565
if (JSON_VALIDATOR_TEST_COVERAGE)
66-
if (CMAKE_CXX_COMPILER_ID STREQUAL Clang)
67-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
68-
elseif (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
69-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
70-
else ()
71-
message(WARNING
72-
"JsonValidator: Other toolchain coverage flags unknown.\n"
73-
"Using --coverage as default")
74-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
75-
endif ()
66+
if (CMAKE_CXX_COMPILER_ID STREQUAL Clang)
67+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
68+
elseif (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
69+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
70+
else ()
71+
message(WARNING
72+
"JsonValidator: Other toolchain coverage flags unknown.\n"
73+
"Using --coverage as default")
74+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
75+
endif ()
7676
endif ()
7777

7878
#[==============================================================================================[
@@ -106,19 +106,19 @@ endif ()
106106

107107
# Handle configure flags
108108
if (JSON_VALIDATOR_INSTALL)
109-
# TODO: This is not ideal, this package should not be installing nlohmann::json
110-
# Currently required in order to satisfy cmake exporter
111-
set(JSON_Install ON CACHE BOOL "")
109+
# TODO: This is not ideal, this package should not be installing nlohmann::json
110+
# Currently required in order to satisfy cmake exporter
111+
set(JSON_Install ON CACHE BOOL "")
112112
endif ()
113113

114114
# Get all dependencies
115115
FetchContent_MakeAvailable(${fetch_packages})
116116
if (JSON_VALIDATOR_INSTALL AND NOT nlohmann_json_FOUND AND JSON_Install)
117-
# TODO: This is not ideal
118-
message(WARNING
119-
"JsonValidator: No nlohmann::json found on the system and nlohmann_json_schema_validator will be installed\n"
120-
"This will also install nlohmann::json in its typical installation path\n"
121-
"This is not ideal because it might overwrite system installed")
117+
# TODO: This is not ideal
118+
message(WARNING
119+
"JsonValidator: No nlohmann::json found on the system and nlohmann_json_schema_validator will be installed\n"
120+
"This will also install nlohmann::json in its typical installation path\n"
121+
"This is not ideal because it might overwrite system installed")
122122
endif ()
123123

124124
#[==============================================================================================[

0 commit comments

Comments
 (0)