Merge pull request #289 from wravery/find-pegtl

Call find_package(PEGTL) implicitly from find_package(cppgraphqlgen CONFIG)
microsoft · May 15, 2023 · 00a6d4b · 00a6d4b
2 parents 2175116 + b4c377c
commit 00a6d4b
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -107,7 +107,7 @@ endfunction()
 
 find_package(Threads MODULE REQUIRED)
 
-find_package(pegtl 3.2.6 QUIET CONFIG)
+find_package(pegtl 3.2.7 QUIET CONFIG)
 if(NOT pegtl_FOUND)
   # If a compatible version of PEGTL is not already installed, build and install it from the submodule directory.
   set(PEGTL_BUILD_TESTS OFF CACHE BOOL "Disable PEGTL tests")

diff --git a/PEGTL b/PEGTL
diff --git a/cmake/cppgraphqlgen-config.cmake b/cmake/cppgraphqlgen-config.cmake
@@ -29,5 +29,6 @@ The following functions are defined to help with code generation and build targe
 
 include(CMakeFindDependencyMacro)
 find_package(Threads REQUIRED)
+find_package(pegtl 3.2.7 CONFIG REQUIRED)
 include("${CMAKE_CURRENT_LIST_DIR}/cppgraphqlgen-targets.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/cppgraphqlgen-functions.cmake")
diff --git a/cmake/version.txt b/cmake/version.txt
@@ -1 +1 @@
-4.5.2
+4.5.3
diff --git 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.2" };
+constexpr std::string_view FullVersion { "4.5.3" };
 
 constexpr size_t MajorVersion = 4;
 constexpr size_t MinorVersion = 5;
-constexpr size_t PatchVersion = 2;
+constexpr size_t PatchVersion = 3;
 
 } // namespace graphql::internal
 

diff --git a/res/ClientGen.rc b/res/ClientGen.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,2,0
-#define GRAPHQL_RC_VERSION_STR "4.5.2"
+#define GRAPHQL_RC_VERSION     4,5,3,0
+#define GRAPHQL_RC_VERSION_STR "4.5.3"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

diff --git a/res/SchemaGen.rc b/res/SchemaGen.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,2,0
-#define GRAPHQL_RC_VERSION_STR "4.5.2"
+#define GRAPHQL_RC_VERSION     4,5,3,0
+#define GRAPHQL_RC_VERSION_STR "4.5.3"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

diff --git a/res/graphqlclient_version.rc b/res/graphqlclient_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,2,0
-#define GRAPHQL_RC_VERSION_STR "4.5.2"
+#define GRAPHQL_RC_VERSION     4,5,3,0
+#define GRAPHQL_RC_VERSION_STR "4.5.3"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

diff --git a/res/graphqljson_version.rc b/res/graphqljson_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,2,0
-#define GRAPHQL_RC_VERSION_STR "4.5.2"
+#define GRAPHQL_RC_VERSION     4,5,3,0
+#define GRAPHQL_RC_VERSION_STR "4.5.3"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

diff --git a/res/graphqlpeg_version.rc b/res/graphqlpeg_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,2,0
-#define GRAPHQL_RC_VERSION_STR "4.5.2"
+#define GRAPHQL_RC_VERSION     4,5,3,0
+#define GRAPHQL_RC_VERSION_STR "4.5.3"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

diff --git a/res/graphqlresponse_version.rc b/res/graphqlresponse_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,2,0
-#define GRAPHQL_RC_VERSION_STR "4.5.2"
+#define GRAPHQL_RC_VERSION     4,5,3,0
+#define GRAPHQL_RC_VERSION_STR "4.5.3"
 
 #ifndef DEBUG
 #define VER_DEBUG   0

diff --git a/res/graphqlservice_version.rc b/res/graphqlservice_version.rc
@@ -3,8 +3,8 @@
 
 #include <winver.h>
 
-#define GRAPHQL_RC_VERSION     4,5,2,0
-#define GRAPHQL_RC_VERSION_STR "4.5.2"
+#define GRAPHQL_RC_VERSION     4,5,3,0
+#define GRAPHQL_RC_VERSION_STR "4.5.3"
 
 #ifndef DEBUG
 #define VER_DEBUG   0