Merge changes from master to pegtl

Author: wravery

.gitignore

@@ -19,6 +19,7 @@ CTestCostData.txt
 CTestTestfile.cmake
 install_manifest.txt
 LastTest.log
+lib*.a
 lib*.so
 Makefile
 schemagen

CMakeLists.txt

@@ -2,32 +2,33 @@
 # Licensed under the MIT License.
 
 cmake_minimum_required(VERSION 3.5.1)
-project(cppgraphql)
+project(cppgraphqlgen)
 
 if(WIN32)
   # Let CMake figure out the exports for the SHARED library (DLL) on Windows.
   SET(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
 endif()
 
-add_library(graphqlservice SHARED GraphQLService.cpp Introspection.cpp IntrospectionSchema.cpp)
+add_library(graphqlservice GraphQLService.cpp Introspection.cpp IntrospectionSchema.cpp)
 add_executable(schemagen SchemaGenerator.cpp)
 
 find_library(GRAPHQLPARSER graphqlparser)
 
+find_package(cpprestsdk REQUIRED)
+set(CPPRESTSDK cpprestsdk::cpprest)
+
 if(UNIX)
-  find_library(CPPRESTSDK_LIB cpprest)
-elseif(WIN32)
-  find_package(cpprestsdk REQUIRED)
-  set(CPPRESTSDK_LIB cpprestsdk::cpprest)
+  find_library(BOOST_SYSTEM boost_system)
+  list(APPEND CPPRESTSDK ${BOOST_SYSTEM})
 endif()
 
 find_package(pegtl CONFIG REQUIRED)
 
 add_library(graphqlpeg SHARED GraphQLGrammar.cpp)
-target_include_directories(graphqlpeg SYSTEM PUBLIC ${CMAKE_PREFIX_PATH}/include ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+target_include_directories(graphqlpeg INTERFACE $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
 target_link_libraries(graphqlpeg taocpp::pegtl ${GRAPHQLPARSER})
 
-target_include_directories(graphqlservice SYSTEM PUBLIC ${CMAKE_PREFIX_PATH}/include ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+target_include_directories(graphqlservice INTERFACE $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
 target_link_libraries(graphqlservice ${CPPRESTSDK_LIB} ${GRAPHQLPARSER} graphqlpeg)
 target_link_libraries(schemagen ${CPPRESTSDK_LIB} ${GRAPHQLPARSER} graphqlpeg)
 
@@ -38,74 +39,85 @@ add_custom_command(
   COMMENT "Generating IntrospectionSchema files"
 )
 
-add_custom_command(
-  OUTPUT TodaySchema.cpp TodaySchema.h
-  COMMAND schemagen ${CMAKE_SOURCE_DIR}/schema.today.graphql Today today
-  DEPENDS schemagen schema.today.graphql
-  COMMENT "Generating mock TodaySchema files"
-)
-
-add_library(todaygraphql SHARED
-  TodaySchema.cpp
-  Today.cpp)
-
-target_link_libraries(todaygraphql
-  ${CPPRESTSDK_LIB}
-  ${GRAPHQLPARSER}
-  graphqlservice)
-target_include_directories(todaygraphql SYSTEM PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
-
-add_executable(test_today test_today.cpp)
-
-target_link_libraries(test_today
-  ${CPPRESTSDK_LIB}
-  ${GRAPHQLPARSER}
-  graphqlservice
-  todaygraphql)
-target_include_directories(test_today SYSTEM PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
-
-enable_testing()
-add_executable(tests tests.cpp)
-find_package(GTest REQUIRED)
-target_link_libraries(tests
-  ${CPPRESTSDK_LIB}
-  ${GRAPHQLPARSER}
-  graphqlservice
-  graphqlpeg
-  todaygraphql
-  GTest::GTest
-  GTest::Main)
-target_include_directories(tests SYSTEM PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
-add_test(TodayServiceCase tests)
-add_test(ArgumentsCase tests)
-
 if(UNIX)
   target_compile_options(graphqlservice PRIVATE -std=c++11)
-  target_compile_options(todaygraphql PRIVATE -std=c++11)
   target_compile_options(schemagen PRIVATE -std=c++11)
-  target_compile_options(test_today PRIVATE -std=c++11)
-  target_compile_options(tests PRIVATE -std=c++11)
+endif()
+
+option(BUILD_TESTS "Build the tests and sample schema library." ON)
+option(UPDATE_SAMPLES "Regenerate the sample schema sources whether or not we're building the tests and the sample library." ON)
+
+if(BUILD_TESTS OR UPDATE_SAMPLES)
+  add_custom_command(
+    OUTPUT TodaySchema.cpp TodaySchema.h
+    COMMAND schemagen ${CMAKE_SOURCE_DIR}/schema.today.graphql Today today
+    DEPENDS schemagen schema.today.graphql
+    COMMENT "Generating mock TodaySchema files"
+  )
+
+  if(BUILD_TESTS)
+    add_library(todaygraphql
+      TodaySchema.cpp
+      Today.cpp)
+
+    target_link_libraries(todaygraphql
+      ${CPPRESTSDK}
+      ${GRAPHQLPARSER}
+      graphqlservice)
+    target_include_directories(todaygraphql SYSTEM PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+
+    add_executable(test_today test_today.cpp)
+
+    target_link_libraries(test_today
+      ${CPPRESTSDK}
+      ${GRAPHQLPARSER}
+      graphqlservice
+      todaygraphql)
+    target_include_directories(test_today SYSTEM PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+
+    enable_testing()
+    add_executable(tests tests.cpp)
+    find_package(GTest REQUIRED)
+    target_link_libraries(tests
+      ${CPPRESTSDK}
+      ${GRAPHQLPARSER}
+	  graphqlpeg
+      graphqlservice
+      todaygraphql
+      GTest::GTest
+      GTest::Main)
+    target_include_directories(tests SYSTEM PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+    add_test(TodayServiceCase tests)
+    add_test(ArgumentsCase tests)
+
+    if(UNIX)
+      target_compile_options(todaygraphql PRIVATE -std=c++11)
+      target_compile_options(test_today PRIVATE -std=c++11)
+      target_compile_options(tests PRIVATE -std=c++11)
+    endif()
+  endif()
+
+  if(UPDATE_SAMPLES)
+    install(FILES IntrospectionSchema.h IntrospectionSchema.cpp TodaySchema.h TodaySchema.cpp
+      DESTINATION ${CMAKE_SOURCE_DIR}/samples)
+  endif()
 endif()
 
 install(TARGETS graphqlservice schemagen
+  EXPORT cppgraphqlgen-config
   RUNTIME DESTINATION bin
+  ARCHIVE DESTINATION lib
   LIBRARY DESTINATION lib)
 
 install(FILES GraphQLService.h Introspection.h IntrospectionSchema.h
   DESTINATION include/graphqlservice)
 
-install(FILES IntrospectionSchema.h IntrospectionSchema.cpp TodaySchema.h TodaySchema.cpp
-  DESTINATION ${CMAKE_SOURCE_DIR}/samples)
-
 if(WIN32)
   set(GRAPHQLSERVICE_DIR $<TARGET_FILE_DIR:graphqlservice>)
   install(FILES ${GRAPHQLSERVICE_DIR}/graphqlservice.lib
     DESTINATION lib)
-
-  option(INSTALL_WINDOWS_DLLS "Copy all Windows DLLs as part of the install to get dependencies." OFF)
-
-  if(INSTALL_WINDOWS_DLLS)
-    install(CODE "include(${CMAKE_SOURCE_DIR}/copy-windows-dlls.cmake)"
-      CODE "copy_windows_dlls(${CMAKE_BINARY_DIR})")
-  endif()
 endif()
+
+install(EXPORT cppgraphqlgen-config
+  NAMESPACE cppgraphqlgen::
+  DESTINATION lib/cppgraphqlgen)