diff --git a/CMakeLists.txt b/CMakeLists.txt index d5049346..2f25e927 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,7 @@ endif() option(GRAPHQL_BUILD_SCHEMAGEN "Build the schemagen tool." ON) option(GRAPHQL_BUILD_CLIENTGEN "Build the clientgen tool." ON) option(GRAPHQL_BUILD_TESTS "Build the tests and sample schema library." ON) +option(GRAPHQL_USE_RAPIDJSON "Use RapidJSON for JSON serialization." ON) if(GRAPHQL_BUILD_SCHEMAGEN) list(APPEND VCPKG_MANIFEST_FEATURES "schemagen") @@ -50,6 +51,10 @@ if(GRAPHQL_BUILD_TESTS) list(APPEND VCPKG_MANIFEST_FEATURES "tests") endif() +if(GRAPHQL_USE_RAPIDJSON) + list(APPEND VCPKG_MANIFEST_FEATURES "rapidjson") +endif() + if(GRAPHQL_BUILD_SCHEMAGEN AND GRAPHQL_BUILD_CLIENTGEN) option(GRAPHQL_UPDATE_SAMPLES "Regenerate the sample schema sources whether or not we're building the tests." ON) diff --git a/cmake/version.txt b/cmake/version.txt index d01c9f66..50021202 100644 --- a/cmake/version.txt +++ b/cmake/version.txt @@ -1 +1 @@ -4.5.4 \ No newline at end of file +4.5.5 \ No newline at end of file diff --git a/include/graphqlservice/internal/Version.h b/include/graphqlservice/internal/Version.h index 7913c244..279a78a0 100644 --- a/include/graphqlservice/internal/Version.h +++ b/include/graphqlservice/internal/Version.h @@ -10,11 +10,11 @@ namespace graphql::internal { -constexpr std::string_view FullVersion { "4.5.4" }; +constexpr std::string_view FullVersion { "4.5.5" }; constexpr size_t MajorVersion = 4; constexpr size_t MinorVersion = 5; -constexpr size_t PatchVersion = 4; +constexpr size_t PatchVersion = 5; } // namespace graphql::internal diff --git a/res/ClientGen.rc b/res/ClientGen.rc index 08e74717..096c1a61 100644 --- a/res/ClientGen.rc +++ b/res/ClientGen.rc @@ -3,8 +3,8 @@ #include -#define GRAPHQL_RC_VERSION 4,5,4,0 -#define GRAPHQL_RC_VERSION_STR "4.5.4" +#define GRAPHQL_RC_VERSION 4,5,5,0 +#define GRAPHQL_RC_VERSION_STR "4.5.5" #ifndef DEBUG #define VER_DEBUG 0 diff --git a/res/SchemaGen.rc b/res/SchemaGen.rc index ea81cc60..cd1f31cf 100644 --- a/res/SchemaGen.rc +++ b/res/SchemaGen.rc @@ -3,8 +3,8 @@ #include -#define GRAPHQL_RC_VERSION 4,5,4,0 -#define GRAPHQL_RC_VERSION_STR "4.5.4" +#define GRAPHQL_RC_VERSION 4,5,5,0 +#define GRAPHQL_RC_VERSION_STR "4.5.5" #ifndef DEBUG #define VER_DEBUG 0 diff --git a/res/graphqlclient_version.rc b/res/graphqlclient_version.rc index 7ceb7bec..27a4f637 100644 --- a/res/graphqlclient_version.rc +++ b/res/graphqlclient_version.rc @@ -3,8 +3,8 @@ #include -#define GRAPHQL_RC_VERSION 4,5,4,0 -#define GRAPHQL_RC_VERSION_STR "4.5.4" +#define GRAPHQL_RC_VERSION 4,5,5,0 +#define GRAPHQL_RC_VERSION_STR "4.5.5" #ifndef DEBUG #define VER_DEBUG 0 diff --git a/res/graphqljson_version.rc b/res/graphqljson_version.rc index d19660f6..1f1cfe15 100644 --- a/res/graphqljson_version.rc +++ b/res/graphqljson_version.rc @@ -3,8 +3,8 @@ #include -#define GRAPHQL_RC_VERSION 4,5,4,0 -#define GRAPHQL_RC_VERSION_STR "4.5.4" +#define GRAPHQL_RC_VERSION 4,5,5,0 +#define GRAPHQL_RC_VERSION_STR "4.5.5" #ifndef DEBUG #define VER_DEBUG 0 diff --git a/res/graphqlpeg_version.rc b/res/graphqlpeg_version.rc index b3401c9a..647d84d3 100644 --- a/res/graphqlpeg_version.rc +++ b/res/graphqlpeg_version.rc @@ -3,8 +3,8 @@ #include -#define GRAPHQL_RC_VERSION 4,5,4,0 -#define GRAPHQL_RC_VERSION_STR "4.5.4" +#define GRAPHQL_RC_VERSION 4,5,5,0 +#define GRAPHQL_RC_VERSION_STR "4.5.5" #ifndef DEBUG #define VER_DEBUG 0 diff --git a/res/graphqlresponse_version.rc b/res/graphqlresponse_version.rc index 870b7bf5..c26c1034 100644 --- a/res/graphqlresponse_version.rc +++ b/res/graphqlresponse_version.rc @@ -3,8 +3,8 @@ #include -#define GRAPHQL_RC_VERSION 4,5,4,0 -#define GRAPHQL_RC_VERSION_STR "4.5.4" +#define GRAPHQL_RC_VERSION 4,5,5,0 +#define GRAPHQL_RC_VERSION_STR "4.5.5" #ifndef DEBUG #define VER_DEBUG 0 diff --git a/res/graphqlservice_version.rc b/res/graphqlservice_version.rc index d8517603..d47f1734 100644 --- a/res/graphqlservice_version.rc +++ b/res/graphqlservice_version.rc @@ -3,8 +3,8 @@ #include -#define GRAPHQL_RC_VERSION 4,5,4,0 -#define GRAPHQL_RC_VERSION_STR "4.5.4" +#define GRAPHQL_RC_VERSION 4,5,5,0 +#define GRAPHQL_RC_VERSION_STR "4.5.5" #ifndef DEBUG #define VER_DEBUG 0 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4b6d4412..2d763474 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -379,8 +379,6 @@ endif() # You will also need to define how to build the graphqljson library target with your # implementation, and you should set BUILD_GRAPHQLJSON so that the test dependencies know # about your version of graphqljson. -option(GRAPHQL_USE_RAPIDJSON "Use RapidJSON for JSON serialization." ON) - if(GRAPHQL_USE_RAPIDJSON) find_package(RapidJSON CONFIG REQUIRED) diff --git a/vcpkg.json b/vcpkg.json index cdf3bdb3..69570624 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -20,6 +20,12 @@ "gtest" ] }, + "rapidjson": { + "description": "Build the graphqljson library with RapidJSON.", + "dependencies": [ + "rapidjson" + ] + }, "update-samples": { "description": "Regenerate the sample schema sources whether or not we're building the tests.", "dependencies": [ @@ -41,8 +47,7 @@ } }, "dependencies": [ - "pegtl", - "rapidjson" + "pegtl" ], "builtin-baseline": "a618637937298060bdbe5fbcfb628eabd1082c8a" }