Skip to content

Commit 2dd4cc1

Browse files
wraverywravery
authored
Merge pull request #294 from wravery/conditional-rapidjson-dependency
Make the vcpkg rapidjson dependency conditional on a feature
2 parents 4b9e729 + a33a0cd commit 2dd4cc1

File tree

12 files changed

+29
-21
lines changed

12 files changed

+29
-21
lines changed

‎CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ endif()
3737
option(GRAPHQL_BUILD_SCHEMAGEN "Build the schemagen tool." ON)
3838
option(GRAPHQL_BUILD_CLIENTGEN "Build the clientgen tool." ON)
3939
option(GRAPHQL_BUILD_TESTS "Build the tests and sample schema library." ON)
40+
option(GRAPHQL_USE_RAPIDJSON "Use RapidJSON for JSON serialization." ON)
4041

4142
if(GRAPHQL_BUILD_SCHEMAGEN)
4243
list(APPEND VCPKG_MANIFEST_FEATURES "schemagen")
@@ -50,6 +51,10 @@ if(GRAPHQL_BUILD_TESTS)
5051
list(APPEND VCPKG_MANIFEST_FEATURES "tests")
5152
endif()
5253

54+
if(GRAPHQL_USE_RAPIDJSON)
55+
list(APPEND VCPKG_MANIFEST_FEATURES "rapidjson")
56+
endif()
57+
5358
if(GRAPHQL_BUILD_SCHEMAGEN AND GRAPHQL_BUILD_CLIENTGEN)
5459
option(GRAPHQL_UPDATE_SAMPLES "Regenerate the sample schema sources whether or not we're building the tests." ON)
5560

‎cmake/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.5.4
1+
4.5.5

‎include/graphqlservice/internal/Version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010

1111
namespace graphql::internal {
1212

13-
constexpr std::string_view FullVersion { "4.5.4" };
13+
constexpr std::string_view FullVersion { "4.5.5" };
1414

1515
constexpr size_t MajorVersion = 4;
1616
constexpr size_t MinorVersion = 5;
17-
constexpr size_t PatchVersion = 4;
17+
constexpr size_t PatchVersion = 5;
1818

1919
} // namespace graphql::internal
2020

‎res/ClientGen.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include <winver.h>
55

6-
#define GRAPHQL_RC_VERSION 4,5,4,0
7-
#define GRAPHQL_RC_VERSION_STR "4.5.4"
6+
#define GRAPHQL_RC_VERSION 4,5,5,0
7+
#define GRAPHQL_RC_VERSION_STR "4.5.5"
88

99
#ifndef DEBUG
1010
#define VER_DEBUG 0

‎res/SchemaGen.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include <winver.h>
55

6-
#define GRAPHQL_RC_VERSION 4,5,4,0
7-
#define GRAPHQL_RC_VERSION_STR "4.5.4"
6+
#define GRAPHQL_RC_VERSION 4,5,5,0
7+
#define GRAPHQL_RC_VERSION_STR "4.5.5"
88

99
#ifndef DEBUG
1010
#define VER_DEBUG 0

‎res/graphqlclient_version.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include <winver.h>
55

6-
#define GRAPHQL_RC_VERSION 4,5,4,0
7-
#define GRAPHQL_RC_VERSION_STR "4.5.4"
6+
#define GRAPHQL_RC_VERSION 4,5,5,0
7+
#define GRAPHQL_RC_VERSION_STR "4.5.5"
88

99
#ifndef DEBUG
1010
#define VER_DEBUG 0

‎res/graphqljson_version.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include <winver.h>
55

6-
#define GRAPHQL_RC_VERSION 4,5,4,0
7-
#define GRAPHQL_RC_VERSION_STR "4.5.4"
6+
#define GRAPHQL_RC_VERSION 4,5,5,0
7+
#define GRAPHQL_RC_VERSION_STR "4.5.5"
88

99
#ifndef DEBUG
1010
#define VER_DEBUG 0

‎res/graphqlpeg_version.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include <winver.h>
55

6-
#define GRAPHQL_RC_VERSION 4,5,4,0
7-
#define GRAPHQL_RC_VERSION_STR "4.5.4"
6+
#define GRAPHQL_RC_VERSION 4,5,5,0
7+
#define GRAPHQL_RC_VERSION_STR "4.5.5"
88

99
#ifndef DEBUG
1010
#define VER_DEBUG 0

‎res/graphqlresponse_version.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include <winver.h>
55

6-
#define GRAPHQL_RC_VERSION 4,5,4,0
7-
#define GRAPHQL_RC_VERSION_STR "4.5.4"
6+
#define GRAPHQL_RC_VERSION 4,5,5,0
7+
#define GRAPHQL_RC_VERSION_STR "4.5.5"
88

99
#ifndef DEBUG
1010
#define VER_DEBUG 0

‎res/graphqlservice_version.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#include <winver.h>
55

6-
#define GRAPHQL_RC_VERSION 4,5,4,0
7-
#define GRAPHQL_RC_VERSION_STR "4.5.4"
6+
#define GRAPHQL_RC_VERSION 4,5,5,0
7+
#define GRAPHQL_RC_VERSION_STR "4.5.5"
88

99
#ifndef DEBUG
1010
#define VER_DEBUG 0

0 commit comments

Comments
 (0)