move public headers to graphqlservice/ directory

This is where the file are installed.
This means the files generated by schemagen should also specify this directory.

Author: Sarcasm

CMakeLists.txt

@@ -11,19 +11,25 @@ endif()
 
 find_package(Threads MODULE REQUIRED)
 
+include(CMakePackageConfigHelpers)
+
 find_package(pegtl CONFIG REQUIRED)
 
 add_executable(schemagen
   GraphQLTree.cpp
   GraphQLResponse.cpp
   SchemaGenerator.cpp)
 target_link_libraries(schemagen PRIVATE taocpp::pegtl)
-target_include_directories(schemagen PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+target_include_directories(schemagen PRIVATE ${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR})
 set_property(TARGET schemagen PROPERTY CXX_STANDARD 11)
 
 add_custom_command(
-  OUTPUT IntrospectionSchema.cpp IntrospectionSchema.h
+  OUTPUT
+    graphqlservice/IntrospectionSchema.cpp
+    graphqlservice/IntrospectionSchema.h
   COMMAND schemagen
+  COMMAND ${CMAKE_COMMAND} -E rename IntrospectionSchema.cpp graphqlservice/IntrospectionSchema.cpp
+  COMMAND ${CMAKE_COMMAND} -E rename IntrospectionSchema.h graphqlservice/IntrospectionSchema.h
   DEPENDS schemagen
   COMMENT "Generating IntrospectionSchema files"
 )
@@ -33,11 +39,15 @@ add_library(graphqlservice
   GraphQLResponse.cpp
   GraphQLService.cpp
   Introspection.cpp
-  IntrospectionSchema.cpp)
+  ${CMAKE_BINARY_DIR}/graphqlservice/IntrospectionSchema.cpp)
 target_link_libraries(graphqlservice PRIVATE taocpp::pegtl)
 target_link_libraries(graphqlservice PUBLIC ${CMAKE_THREAD_LIBS_INIT})
-target_include_directories(graphqlservice SYSTEM INTERFACE $<INSTALL_INTERFACE:include>)
-target_include_directories(graphqlservice PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+target_include_directories(graphqlservice
+  PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
+    $<INSTALL_INTERFACE:include>
+)
 set_property(TARGET graphqlservice PROPERTY CXX_STANDARD 11)
 
 option(BUILD_TESTS "Build the tests and sample schema library." ON)
@@ -61,8 +71,8 @@ if(BUILD_TESTS OR UPDATE_SAMPLES)
 
     add_library(todaygraphql
        ${CMAKE_BINARY_DIR}/TodaySchema.cpp
-      Today.cpp
-	  JSONResponse.cpp)
+       Today.cpp
+       JSONResponse.cpp)
     target_link_libraries(todaygraphql PUBLIC
       graphqlservice)
     target_include_directories(todaygraphql SYSTEM PUBLIC ${RAPIDJSON_INCLUDE_DIRS})
@@ -101,34 +111,41 @@ if(BUILD_TESTS OR UPDATE_SAMPLES)
 
   if(UPDATE_SAMPLES)
     install(FILES
-      ${CMAKE_BINARY_DIR}/IntrospectionSchema.h
-      ${CMAKE_BINARY_DIR}/IntrospectionSchema.cpp
+      ${CMAKE_BINARY_DIR}/graphqlservice/IntrospectionSchema.h
+      ${CMAKE_BINARY_DIR}/graphqlservice/IntrospectionSchema.cpp
       ${CMAKE_BINARY_DIR}/TodaySchema.h
       ${CMAKE_BINARY_DIR}/TodaySchema.cpp
       DESTINATION ${CMAKE_SOURCE_DIR}/samples)
   endif()
 endif()
 
 install(TARGETS graphqlservice
-  EXPORT cppgraphqlgen-config
+  EXPORT cppgraphqlgen-targets
   RUNTIME DESTINATION bin
   ARCHIVE DESTINATION lib
   LIBRARY DESTINATION lib)
 
 install(TARGETS schemagen
+  EXPORT cppgraphqlgen-targets
   RUNTIME DESTINATION tools/cppgraphqlgen
   CONFIGURATIONS Release)
 
 install(FILES
-  GraphQLTree.h
-  GraphQLResponse.h
-  GraphQLService.h
-  Introspection.h
-  ${CMAKE_BINARY_DIR}/IntrospectionSchema.h
-  JSONResponse.h
+  include/graphqlservice/GraphQLTree.h
+  include/graphqlservice/GraphQLResponse.h
+  include/graphqlservice/GraphQLService.h
+  include/graphqlservice/Introspection.h
+  ${CMAKE_BINARY_DIR}/graphqlservice/IntrospectionSchema.h
+  include/graphqlservice/JSONResponse.h
   DESTINATION include/graphqlservice
   CONFIGURATIONS Release)
 
-install(EXPORT cppgraphqlgen-config
+set(CMAKE_INSTALL_CONFIGDIR lib/cmake/${PROJECT_NAME})
+install(FILES cmake/${PROJECT_NAME}-config.cmake
+  DESTINATION ${CMAKE_INSTALL_CONFIGDIR}
+)
+
+install(EXPORT cppgraphqlgen-targets
   NAMESPACE cppgraphqlgen::
-  DESTINATION share/cppgraphqlgen)
+  DESTINATION ${CMAKE_INSTALL_CONFIGDIR}
+)

GraphQLResponse.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-#include "GraphQLResponse.h"
+#include "graphqlservice/GraphQLResponse.h"
 
 #include <stdexcept>
 
@@ -466,4 +466,4 @@ ScalarType Value::release<ScalarType>()
 
 } /* namespace response */
 } /* namespace graphql */
-} /* namespace facebook */
+} /* namespace facebook */

GraphQLService.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-#include "GraphQLService.h"
+#include "graphqlservice/GraphQLService.h"
 #include "GraphQLGrammar.h"
 
 #include <iostream>
@@ -1066,4 +1066,4 @@ void OperationDefinitionVisitor::visit(const peg::ast_node& operationDefinition)
 
 } /* namespace service */
 } /* namespace graphql */
-} /* namespace facebook */
+} /* namespace facebook */

GraphQLTree.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-#include "GraphQLTree.h"
+#include "graphqlservice/GraphQLTree.h"
 #include "GraphQLGrammar.h"
 
 #include <tao/pegtl/contrib/unescape.hpp>
@@ -597,4 +597,4 @@ std::unique_ptr<peg::ast<const char*>> operator "" _graphql(const char* text, si
 }
 
 } /* namespace graphql */
-} /* namespace facebook */
+} /* namespace facebook */

Introspection.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-#include "Introspection.h"
+#include "graphqlservice/Introspection.h"
 
 namespace facebook {
 namespace graphql {
@@ -652,4 +652,4 @@ std::future<std::unique_ptr<std::string>> EnumValue::getDeprecationReason(servic
 
 } /* namespace facebook */
 } /* namespace graphql */
-} /* namespace introspection */
+} /* namespace introspection */

JSONResponse.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-#include "JSONResponse.h"
+#include "graphqlservice/JSONResponse.h"
 
 namespace facebook {
 namespace graphql {

SchemaGenerator.cpp

@@ -1168,7 +1168,7 @@ bool Generator::outputHeader() const noexcept
 #include <string>
 #include <vector>
 
-#include "GraphQLService.h"
+#include <graphqlservice/GraphQLService.h>
 
 namespace facebook {
 namespace graphql {
@@ -1497,7 +1497,7 @@ bool Generator::outputSource() const noexcept
 // Licensed under the MIT License.
 
 #include ")cpp" << _filenamePrefix << R"cpp(Schema.h"
-#include "Introspection.h"
+#include <graphqlservice/Introspection.h>
 
 #include <algorithm>
 #include <functional>

SchemaGenerator.h

@@ -6,7 +6,7 @@
 #include <array>
 #include <cstdio>
 
-#include "GraphQLService.h"
+#include "graphqlservice/GraphQLService.h"
 
 namespace facebook {
 namespace graphql {
@@ -301,4 +301,4 @@ class Generator
 
 } /* namespace schema */
 } /* namespace graphql */
-} /* namespace facebook */
+} /* namespace facebook */

cmake/cppgraphqlgen-config.cmake

@@ -0,0 +1,18 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+#[=======================================================================[.rst:
+cppgraphqlgen
+-------------
+
+The following import targets are created
+
+::
+
+  cppgraphqlgen::graphqlservice
+  cppgraphqlgen::schemagen
+#]=======================================================================]
+
+include(CMakeFindDependencyMacro)
+find_package(pegtl REQUIRED)
+include("${CMAKE_CURRENT_LIST_DIR}/cppgraphqlgen-targets.cmake")