Skip to content

Commit 9ef4c8d

Browse files
wraverywravery
authored
Merge pull request #147 from wravery/master
Add all generated files to the repo and fix dependencies
2 parents d557b9d + 8b0e096 commit 9ef4c8d

File tree

92 files changed

+664
-153
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+664
-153
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Debug/
66
Release/
77
Testing/
88
Win32/
9-
/include/graphqlservice/introspection/IntrospectionSchema.h
9+
/IntrospectionSchema.h
1010
/IntrospectionSchema.cpp
1111
*.filters
1212
*.vcxproj

‎CMakeLists.txt

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

44
cmake_minimum_required(VERSION 3.8.2)
55

6-
# Enable CMAKE_MSVC_RUNTIME_LIBRARY on Windows.
7-
cmake_policy(SET CMP0091 NEW)
6+
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.15")
7+
# Enable CMAKE_MSVC_RUNTIME_LIBRARY on Windows.
8+
set(MSVC_MATCH_VCPKG_TRIPLET ON)
9+
cmake_policy(SET CMP0091 NEW)
10+
endif()
811

912
# Default to the last updated version from version.txt.
1013
file(TO_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.txt" VERSION_FILE)
@@ -42,7 +45,7 @@ option(BUILD_SHARED_LIBS "Build shared libraries instead of static libs" OFF)
4245
if(VCPKG_TARGET_TRIPLET)
4346
message(STATUS "Using ${VCPKG_TARGET_TRIPLET} triplet with vcpkg")
4447

45-
if(MSVC)
48+
if(MSVC AND MSVC_MATCH_VCPKG_TRIPLET)
4649
# Match the MSVC runtime if we're using VCPKG with static libraries.
4750
if(VCPKG_TARGET_TRIPLET MATCHES [[^.+-static$]])
4851
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
@@ -51,9 +54,6 @@ if(VCPKG_TARGET_TRIPLET)
5154
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
5255
message(STATUS "Using MSVC runtime DLL")
5356
endif()
54-
55-
add_custom_target(output_msvc_runtime ALL
56-
${CMAKE_COMMAND} -E echo "Using ${CMAKE_MSVC_RUNTIME_LIBRARY} MSVC runtime to match ${VCPKG_TARGET_TRIPLET}")
5757
endif()
5858
endif()
5959

@@ -84,6 +84,8 @@ else()
8484
set(GRAPHQL_UPDATE_SAMPLES OFF CACHE BOOL "Disable regenerating samples." FORCE)
8585
endif()
8686

87+
option(GRAPHQL_UPDATE_VERSION "Regenerate graphqlservice/internal/Version.h and all of the version info rc files for Windows." ON)
88+
8789
add_subdirectory(cmake)
8890
add_subdirectory(src)
8991

‎include/graphqlservice/internal/Version.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License.
3+
4+
#pragma once
5+
6+
#ifndef VERSION_H
7+
#define VERSION_H
8+
9+
#include <string_view>
10+
11+
namespace graphql::internal {
12+
13+
constexpr std::string_view FullVersion { "3.4.1" };
14+
15+
constexpr size_t MajorVersion = 3;
16+
constexpr size_t MinorVersion = 4;
17+
constexpr size_t PatchVersion = 1;
18+
19+
} // namespace graphql::internal
20+
21+
#endif // VERSION_H

‎samples/introspection/IntrospectionSchema.h renamed to ‎include/graphqlservice/introspection/IntrospectionSchema.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4+
// WARNING! Do not edit this file manually, your changes will be overwritten.
5+
46
#pragma once
57

68
#ifndef INTROSPECTIONSCHEMA_H

‎res/SchemaGen.rc

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License.
3+
4+
#include <winver.h>
5+
6+
#define SCHEMAGEN_RC_VERSION 3,4,1,0
7+
#define SCHEMAGEN_RC_VERSION_STR "3.4.1"
8+
9+
#ifndef DEBUG
10+
#define VER_DEBUG 0
11+
#else
12+
#define VER_DEBUG VS_FF_DEBUG
13+
#endif
14+
15+
VS_VERSION_INFO VERSIONINFO
16+
FILEVERSION SCHEMAGEN_RC_VERSION
17+
PRODUCTVERSION SCHEMAGEN_RC_VERSION
18+
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
19+
FILEFLAGS VER_DEBUG
20+
FILEOS VOS__WINDOWS32
21+
FILETYPE VFT_APP
22+
FILESUBTYPE VFT2_UNKNOWN
23+
BEGIN
24+
BLOCK "StringFileInfo"
25+
BEGIN
26+
BLOCK "040904B0"
27+
BEGIN
28+
VALUE "CompanyName", "Microsoft Corporation"
29+
VALUE "FileDescription", "Code generator for https://github.com/microsoft/cppgraphqlgen"
30+
VALUE "FileVersion", SCHEMAGEN_RC_VERSION_STR
31+
VALUE "InternalName", "schemagen"
32+
VALUE "LegalCopyright", "Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License."
33+
VALUE "OriginalFilename", "schemagen.exe"
34+
VALUE "ProductName", "CppGraphQLGen"
35+
VALUE "ProductVersion", SCHEMAGEN_RC_VERSION_STR
36+
END
37+
END
38+
39+
BLOCK "VarFileInfo"
40+
BEGIN
41+
VALUE "Translation", 0x409, 1200
42+
END
43+
END

‎res/graphqljson_version.rc

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License.
3+
4+
#include <winver.h>
5+
6+
#define GRAPHQL_RC_VERSION 3,4,1,0
7+
#define GRAPHQL_RC_VERSION_STR "3.4.1"
8+
9+
#ifndef DEBUG
10+
#define VER_DEBUG 0
11+
#else
12+
#define VER_DEBUG VS_FF_DEBUG
13+
#endif
14+
15+
VS_VERSION_INFO VERSIONINFO
16+
FILEVERSION GRAPHQL_RC_VERSION
17+
PRODUCTVERSION GRAPHQL_RC_VERSION
18+
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
19+
FILEFLAGS VER_DEBUG
20+
FILEOS VOS__WINDOWS32
21+
FILETYPE VFT_DLL
22+
FILESUBTYPE VFT2_UNKNOWN
23+
BEGIN
24+
BLOCK "StringFileInfo"
25+
BEGIN
26+
BLOCK "040904B0"
27+
BEGIN
28+
VALUE "CompanyName", "Microsoft Corporation"
29+
VALUE "FileDescription", "Shared library for https://github.com/microsoft/cppgraphqlgen"
30+
VALUE "FileVersion", GRAPHQL_RC_VERSION_STR
31+
VALUE "InternalName", "graphqljson"
32+
VALUE "LegalCopyright", "Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License."
33+
VALUE "OriginalFilename", "graphqljson.dll"
34+
VALUE "ProductName", "CppGraphQLGen"
35+
VALUE "ProductVersion", GRAPHQL_RC_VERSION_STR
36+
END
37+
END
38+
39+
BLOCK "VarFileInfo"
40+
BEGIN
41+
VALUE "Translation", 0x409, 1200
42+
END
43+
END

‎res/graphqlpeg_version.rc

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License.
3+
4+
#include <winver.h>
5+
6+
#define GRAPHQL_RC_VERSION 3,4,1,0
7+
#define GRAPHQL_RC_VERSION_STR "3.4.1"
8+
9+
#ifndef DEBUG
10+
#define VER_DEBUG 0
11+
#else
12+
#define VER_DEBUG VS_FF_DEBUG
13+
#endif
14+
15+
VS_VERSION_INFO VERSIONINFO
16+
FILEVERSION GRAPHQL_RC_VERSION
17+
PRODUCTVERSION GRAPHQL_RC_VERSION
18+
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
19+
FILEFLAGS VER_DEBUG
20+
FILEOS VOS__WINDOWS32
21+
FILETYPE VFT_DLL
22+
FILESUBTYPE VFT2_UNKNOWN
23+
BEGIN
24+
BLOCK "StringFileInfo"
25+
BEGIN
26+
BLOCK "040904B0"
27+
BEGIN
28+
VALUE "CompanyName", "Microsoft Corporation"
29+
VALUE "FileDescription", "Shared library for https://github.com/microsoft/cppgraphqlgen"
30+
VALUE "FileVersion", GRAPHQL_RC_VERSION_STR
31+
VALUE "InternalName", "graphqlpeg"
32+
VALUE "LegalCopyright", "Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License."
33+
VALUE "OriginalFilename", "graphqlpeg.dll"
34+
VALUE "ProductName", "CppGraphQLGen"
35+
VALUE "ProductVersion", GRAPHQL_RC_VERSION_STR
36+
END
37+
END
38+
39+
BLOCK "VarFileInfo"
40+
BEGIN
41+
VALUE "Translation", 0x409, 1200
42+
END
43+
END

‎res/graphqlresponse_version.rc

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License.
3+
4+
#include <winver.h>
5+
6+
#define GRAPHQL_RC_VERSION 3,4,1,0
7+
#define GRAPHQL_RC_VERSION_STR "3.4.1"
8+
9+
#ifndef DEBUG
10+
#define VER_DEBUG 0
11+
#else
12+
#define VER_DEBUG VS_FF_DEBUG
13+
#endif
14+
15+
VS_VERSION_INFO VERSIONINFO
16+
FILEVERSION GRAPHQL_RC_VERSION
17+
PRODUCTVERSION GRAPHQL_RC_VERSION
18+
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
19+
FILEFLAGS VER_DEBUG
20+
FILEOS VOS__WINDOWS32
21+
FILETYPE VFT_DLL
22+
FILESUBTYPE VFT2_UNKNOWN
23+
BEGIN
24+
BLOCK "StringFileInfo"
25+
BEGIN
26+
BLOCK "040904B0"
27+
BEGIN
28+
VALUE "CompanyName", "Microsoft Corporation"
29+
VALUE "FileDescription", "Shared library for https://github.com/microsoft/cppgraphqlgen"
30+
VALUE "FileVersion", GRAPHQL_RC_VERSION_STR
31+
VALUE "InternalName", "graphqlresponse"
32+
VALUE "LegalCopyright", "Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License."
33+
VALUE "OriginalFilename", "graphqlresponse.dll"
34+
VALUE "ProductName", "CppGraphQLGen"
35+
VALUE "ProductVersion", GRAPHQL_RC_VERSION_STR
36+
END
37+
END
38+
39+
BLOCK "VarFileInfo"
40+
BEGIN
41+
VALUE "Translation", 0x409, 1200
42+
END
43+
END

‎res/graphqlservice_nointrospection_version.rc

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License.
3+
4+
#include <winver.h>
5+
6+
#define GRAPHQL_RC_VERSION 3,4,1,0
7+
#define GRAPHQL_RC_VERSION_STR "3.4.1"
8+
9+
#ifndef DEBUG
10+
#define VER_DEBUG 0
11+
#else
12+
#define VER_DEBUG VS_FF_DEBUG
13+
#endif
14+
15+
VS_VERSION_INFO VERSIONINFO
16+
FILEVERSION GRAPHQL_RC_VERSION
17+
PRODUCTVERSION GRAPHQL_RC_VERSION
18+
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
19+
FILEFLAGS VER_DEBUG
20+
FILEOS VOS__WINDOWS32
21+
FILETYPE VFT_DLL
22+
FILESUBTYPE VFT2_UNKNOWN
23+
BEGIN
24+
BLOCK "StringFileInfo"
25+
BEGIN
26+
BLOCK "040904B0"
27+
BEGIN
28+
VALUE "CompanyName", "Microsoft Corporation"
29+
VALUE "FileDescription", "Shared library for https://github.com/microsoft/cppgraphqlgen"
30+
VALUE "FileVersion", GRAPHQL_RC_VERSION_STR
31+
VALUE "InternalName", "graphqlservice_nointrospection"
32+
VALUE "LegalCopyright", "Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License."
33+
VALUE "OriginalFilename", "graphqlservice_nointrospection.dll"
34+
VALUE "ProductName", "CppGraphQLGen"
35+
VALUE "ProductVersion", GRAPHQL_RC_VERSION_STR
36+
END
37+
END
38+
39+
BLOCK "VarFileInfo"
40+
BEGIN
41+
VALUE "Translation", 0x409, 1200
42+
END
43+
END

‎res/graphqlservice_version.rc

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License.
3+
4+
#include <winver.h>
5+
6+
#define GRAPHQL_RC_VERSION 3,4,1,0
7+
#define GRAPHQL_RC_VERSION_STR "3.4.1"
8+
9+
#ifndef DEBUG
10+
#define VER_DEBUG 0
11+
#else
12+
#define VER_DEBUG VS_FF_DEBUG
13+
#endif
14+
15+
VS_VERSION_INFO VERSIONINFO
16+
FILEVERSION GRAPHQL_RC_VERSION
17+
PRODUCTVERSION GRAPHQL_RC_VERSION
18+
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
19+
FILEFLAGS VER_DEBUG
20+
FILEOS VOS__WINDOWS32
21+
FILETYPE VFT_DLL
22+
FILESUBTYPE VFT2_UNKNOWN
23+
BEGIN
24+
BLOCK "StringFileInfo"
25+
BEGIN
26+
BLOCK "040904B0"
27+
BEGIN
28+
VALUE "CompanyName", "Microsoft Corporation"
29+
VALUE "FileDescription", "Shared library for https://github.com/microsoft/cppgraphqlgen"
30+
VALUE "FileVersion", GRAPHQL_RC_VERSION_STR
31+
VALUE "InternalName", "graphqlservice"
32+
VALUE "LegalCopyright", "Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License."
33+
VALUE "OriginalFilename", "graphqlservice.dll"
34+
VALUE "ProductName", "CppGraphQLGen"
35+
VALUE "ProductVersion", GRAPHQL_RC_VERSION_STR
36+
END
37+
END
38+
39+
BLOCK "VarFileInfo"
40+
BEGIN
41+
VALUE "Translation", 0x409, 1200
42+
END
43+
END

0 commit comments

Comments
 (0)