Skip to content

Commit fa49d12

Browse files
wraverywravery
committed
Rename libraries graphqlservice and graphqlintrospection
1 parent c500583 commit fa49d12

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

res/graphqlservice_nointrospection_version.rc renamed to res/graphqlintrospection_version.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ BEGIN
2828
VALUE "CompanyName", "Microsoft Corporation"
2929
VALUE "FileDescription", "Shared library for https://github.com/microsoft/cppgraphqlgen"
3030
VALUE "FileVersion", GRAPHQL_RC_VERSION_STR
31-
VALUE "InternalName", "graphqlservice_nointrospection"
31+
VALUE "InternalName", "graphqlintrospection"
3232
VALUE "LegalCopyright", "Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License."
33-
VALUE "OriginalFilename", "graphqlservice_nointrospection.dll"
33+
VALUE "OriginalFilename", "graphqlintrospection.dll"
3434
VALUE "ProductName", "CppGraphQLGen"
3535
VALUE "ProductVersion", GRAPHQL_RC_VERSION_STR
3636
END

‎samples/CMakeLists.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ foreach(CPP_FILE IN LISTS SEPARATE_SCHEMA_FILES)
110110
endforeach(CPP_FILE)
111111

112112
add_library(separateschema STATIC ${SEPARATE_SCHEMA_PATHS})
113-
target_link_libraries(separateschema PUBLIC graphqlservice)
113+
target_link_libraries(separateschema PUBLIC graphqlintrospection)
114114
target_compile_definitions(separateschema PUBLIC IMPL_SEPARATE_TODAY)
115115
target_include_directories(separateschema PUBLIC
116116
${CMAKE_CURRENT_SOURCE_DIR}/../include
@@ -130,7 +130,7 @@ foreach(CPP_FILE IN LISTS SEPARATE_NOINTROSPECTION_SCHEMA_FILES)
130130
endforeach(CPP_FILE)
131131

132132
add_library(separateschema_nointrospection STATIC ${SEPARATE_NOINTROSPECTION_SCHEMA_PATHS})
133-
target_link_libraries(separateschema_nointrospection PUBLIC graphqlservice_nointrospection)
133+
target_link_libraries(separateschema_nointrospection PUBLIC graphqlservice)
134134
target_compile_definitions(separateschema_nointrospection PUBLIC IMPL_SEPARATE_TODAY)
135135
target_include_directories(separateschema_nointrospection PUBLIC
136136
${CMAKE_CURRENT_SOURCE_DIR}/../include
@@ -173,16 +173,16 @@ target_include_directories(sample_nointrospection PRIVATE
173173
if(WIN32 AND BUILD_SHARED_LIBS)
174174
add_custom_command(OUTPUT copied_sample_dlls
175175
COMMAND ${CMAKE_COMMAND} -E copy_if_different
176-
$<TARGET_FILE:graphqlservice_nointrospection>
177176
$<TARGET_FILE:graphqlservice>
177+
$<TARGET_FILE:graphqlintrospection>
178178
$<TARGET_FILE:graphqljson>
179179
$<TARGET_FILE:graphqlpeg>
180180
$<TARGET_FILE:graphqlresponse>
181181
${CMAKE_CURRENT_BINARY_DIR}
182182
COMMAND ${CMAKE_COMMAND} -E touch copied_sample_dlls
183183
DEPENDS
184-
graphqlservice_nointrospection
185184
graphqlservice
185+
graphqlintrospection
186186
graphqljson
187187
graphqlpeg
188188
graphqlresponse)
@@ -219,7 +219,7 @@ endif()
219219
if(GRAPHQL_BUILD_TESTS)
220220
# tests
221221
add_library(unifiedschema STATIC unified/TodaySchema.cpp)
222-
target_link_libraries(unifiedschema PUBLIC graphqlservice)
222+
target_link_libraries(unifiedschema PUBLIC graphqlintrospection)
223223
target_include_directories(unifiedschema PUBLIC
224224
${CMAKE_CURRENT_SOURCE_DIR}/../include
225225
${CMAKE_CURRENT_SOURCE_DIR}/../PEGTL/include
@@ -236,7 +236,7 @@ if(GRAPHQL_BUILD_TESTS)
236236
add_bigobj_flag(unifiedgraphql)
237237

238238
add_library(unifiedschema_nointrospection STATIC unified_nointrospection/TodaySchema.cpp)
239-
target_link_libraries(unifiedschema_nointrospection PUBLIC graphqlservice_nointrospection)
239+
target_link_libraries(unifiedschema_nointrospection PUBLIC graphqlservice)
240240
target_include_directories(unifiedschema_nointrospection PUBLIC
241241
${CMAKE_CURRENT_SOURCE_DIR}/../include
242242
${CMAKE_CURRENT_SOURCE_DIR}/../PEGTL/include
@@ -255,7 +255,7 @@ if(GRAPHQL_BUILD_TESTS)
255255
add_library(validationgraphql STATIC
256256
validation/ValidationMock.cpp
257257
validation/ValidationSchema.cpp)
258-
target_link_libraries(validationgraphql PUBLIC graphqlservice)
258+
target_link_libraries(validationgraphql PUBLIC graphqlintrospection)
259259
target_include_directories(validationgraphql PUBLIC
260260
${CMAKE_CURRENT_SOURCE_DIR}/../include
261261
${CMAKE_CURRENT_SOURCE_DIR}/../PEGTL/include

‎src/CMakeLists.txt‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -207,52 +207,52 @@ if(GRAPHQL_UPDATE_SAMPLES)
207207
DEPENDS updated_introspection)
208208
endif()
209209

210-
# graphqlservice_nointrospection
211-
add_library(graphqlservice_nointrospection
210+
# graphqlservice
211+
add_library(graphqlservice
212212
GraphQLService.cpp
213213
GraphQLSchema.cpp
214214
Validation.cpp)
215-
add_library(cppgraphqlgen::graphqlservice_nointrospection ALIAS graphqlservice_nointrospection)
216-
target_link_libraries(graphqlservice_nointrospection PUBLIC
215+
add_library(cppgraphqlgen::graphqlservice ALIAS graphqlservice)
216+
target_link_libraries(graphqlservice PUBLIC
217217
graphqlpeg
218218
graphqlresponse
219219
Threads::Threads)
220220

221221
if(GRAPHQL_UPDATE_SAMPLES)
222222
# Even though this target doesn't build IntrospectionSchema.cpp, it still
223223
# depends on IntrospectionSchema.h for some enum definitions.
224-
add_dependencies(graphqlservice_nointrospection update_introspection)
224+
add_dependencies(graphqlservice update_introspection)
225225
endif()
226226

227227
if(GRAPHQL_UPDATE_VERSION)
228-
update_version_rc(graphqlservice_nointrospection)
228+
update_version_rc(graphqlservice)
229229
endif()
230230

231231
if(WIN32 AND BUILD_SHARED_LIBS)
232-
target_compile_definitions(graphqlservice_nointrospection
232+
target_compile_definitions(graphqlservice
233233
PUBLIC GRAPHQL_DLLEXPORTS
234234
PRIVATE IMPL_GRAPHQLSERVICE_DLL)
235235

236-
add_version_rc(graphqlservice_nointrospection)
236+
add_version_rc(graphqlservice)
237237
endif()
238238

239-
# graphqlservice
240-
add_library(graphqlservice
239+
# graphqlintrospection
240+
add_library(graphqlintrospection
241241
Introspection.cpp
242242
IntrospectionSchema.cpp)
243-
add_library(cppgraphqlgen::graphqlservice ALIAS graphqlservice)
244-
target_link_libraries(graphqlservice PUBLIC graphqlservice_nointrospection)
243+
add_library(cppgraphqlgen::graphqlintrospection ALIAS graphqlintrospection)
244+
target_link_libraries(graphqlintrospection PUBLIC graphqlservice)
245245

246246
if(GRAPHQL_UPDATE_VERSION)
247-
update_version_rc(graphqlservice)
247+
update_version_rc(graphqlintrospection)
248248
endif()
249249

250250
if(WIN32 AND BUILD_SHARED_LIBS)
251-
target_compile_definitions(graphqlservice
251+
target_compile_definitions(graphqlintrospection
252252
PUBLIC GRAPHQL_DLLEXPORTS
253253
PRIVATE IMPL_GRAPHQLINTROSPECTION_DLL)
254254

255-
add_version_rc(graphqlservice)
255+
add_version_rc(graphqlintrospection)
256256
endif()
257257

258258
# RapidJSON is the only option for JSON serialization used in this project, but if you want
@@ -289,7 +289,7 @@ endif()
289289
if(BUILD_GRAPHQLJSON)
290290
option(GRAPHQL_BUILD_TESTS "Build the tests and sample schema library." ON)
291291

292-
target_link_libraries(graphqljson PUBLIC graphqlservice)
292+
target_link_libraries(graphqljson PUBLIC graphqlintrospection)
293293

294294
install(TARGETS graphqljson
295295
EXPORT cppgraphqlgen-targets
@@ -298,16 +298,16 @@ if(BUILD_GRAPHQLJSON)
298298
LIBRARY DESTINATION lib)
299299
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/JSONResponse.h
300300
CONFIGURATIONS ${GRAPHQL_INSTALL_CONFIGURATIONS}
301-
DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlservice)
301+
DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlintrospection)
302302
else()
303303
set(GRAPHQL_BUILD_TESTS OFF CACHE BOOL "GRAPHQL_BUILD_TESTS depends on BUILD_GRAPHQLJSON" FORCE)
304304
endif()
305305

306306
install(TARGETS
307307
graphqlpeg
308308
graphqlresponse
309-
graphqlservice_nointrospection
310309
graphqlservice
310+
graphqlintrospection
311311
EXPORT cppgraphqlgen-targets
312312
RUNTIME DESTINATION bin
313313
ARCHIVE DESTINATION lib
@@ -321,7 +321,7 @@ install(FILES
321321
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/GraphQLGrammar.h
322322
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/GraphQLTree.h
323323
CONFIGURATIONS ${GRAPHQL_INSTALL_CONFIGURATIONS}
324-
DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlservice)
324+
DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlintrospection)
325325

326326
install(FILES
327327
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/SortedMap.h
@@ -333,7 +333,7 @@ install(FILES
333333
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/introspection/Introspection.h
334334
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/introspection/IntrospectionSchema.h
335335
CONFIGURATIONS ${GRAPHQL_INSTALL_CONFIGURATIONS}
336-
DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlservice/introspection)
336+
DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlintrospection/introspection)
337337

338338
install(EXPORT cppgraphqlgen-targets
339339
NAMESPACE cppgraphqlgen::

‎test/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ gtest_add_tests(TARGET pegtl_tests)
5353

5454
add_executable(response_tests ResponseTests.cpp)
5555
target_link_libraries(response_tests PRIVATE
56-
graphqlservice_nointrospection
56+
graphqlservice
5757
GTest::GTest
5858
GTest::Main)
5959
target_include_directories(response_tests PUBLIC
@@ -63,16 +63,16 @@ gtest_add_tests(TARGET response_tests)
6363
if(WIN32 AND BUILD_SHARED_LIBS)
6464
add_custom_command(OUTPUT copied_test_dlls
6565
COMMAND ${CMAKE_COMMAND} -E copy_if_different
66-
$<TARGET_FILE:graphqlservice_nointrospection>
6766
$<TARGET_FILE:graphqlservice>
67+
$<TARGET_FILE:graphqlintrospection>
6868
$<TARGET_FILE:graphqljson>
6969
$<TARGET_FILE:graphqlpeg>
7070
$<TARGET_FILE:graphqlresponse>
7171
${CMAKE_CURRENT_BINARY_DIR}
7272
COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/copied_test_dlls
7373
DEPENDS
74-
graphqlservice_nointrospection
7574
graphqlservice
75+
graphqlintrospection
7676
graphqljson
7777
graphqlpeg
7878
graphqlresponse

0 commit comments

Comments
 (0)