Merge pull request #84 from wravery/master

CMake tweaks to be compatible with earlier versions

Author: wravery

.gitignore

@@ -33,4 +33,6 @@ settings.json
 /test/pegtl_tests
 /test/response_tests
 /test/today_tests
-build
+build/
+install/
+isenseconfig/

CMakeLists.txt

@@ -36,10 +36,11 @@ if(NOT pegtl_FOUND)
   add_subdirectory(PEGTL)
 endif()
 
-add_subdirectory(src)
-
 option(GRAPHQL_UPDATE_SAMPLES "Regenerate the sample schema sources whether or not we're building the tests." ON)
 
+add_subdirectory(cmake)
+add_subdirectory(src)
+
 if(GRAPHQL_BUILD_TESTS OR GRAPHQL_UPDATE_SAMPLES)
   add_subdirectory(samples)
 

PEGTL

@@ -0,0 +1,13 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+cmake_minimum_required(VERSION 3.8.2)
+
+# Enable version checks in find_package
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(${PROJECT_NAME}-config-version.cmake COMPATIBILITY SameMajorVersion)
+
+install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}-config.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
+  DESTINATION ${GRAPHQL_INSTALL_CMAKE_DIR}/${PROJECT_NAME})

cmake/CMakeLists.txt

@@ -55,11 +55,14 @@ if(GRAPHQL_UPDATE_SAMPLES)
 endif()
 
 # sample
-file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/separate/today_schema_files SEPARATE_SCHEMA_CPP)
-list(TRANSFORM SEPARATE_SCHEMA_CPP PREPEND ${CMAKE_CURRENT_SOURCE_DIR}/separate/)
-
-add_library(separateschema OBJECT ${SEPARATE_SCHEMA_CPP})
-target_link_libraries(separateschema PUBLIC graphqlservice)
+set(SEPARATE_SCHEMA_PATHS "")
+file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/separate/today_schema_files SEPARATE_SCHEMA_FILES)
+foreach(CPP_FILE IN LISTS SEPARATE_SCHEMA_FILES)
+  list(APPEND SEPARATE_SCHEMA_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/separate/${CPP_FILE}")
+endforeach(CPP_FILE)
+
+add_library(separateschema OBJECT ${SEPARATE_SCHEMA_PATHS})
+add_dependencies(separateschema graphqlservice)
 target_include_directories(separateschema PUBLIC
   ${CMAKE_CURRENT_BINARY_DIR}/../include
   ${CMAKE_CURRENT_SOURCE_DIR}/../include
@@ -71,9 +74,14 @@ if(GRAPHQL_UPDATE_SAMPLES)
   add_dependencies(separateschema update_samples)
 endif()
 
-add_library(separategraphql today/SeparateToday.cpp)
-target_link_libraries(separategraphql PUBLIC separateschema)
-target_include_directories(separategraphql PUBLIC today)
+add_library(separategraphql
+  today/SeparateToday.cpp
+  $<TARGET_OBJECTS:separateschema>)
+add_dependencies(separategraphql separateschema)
+target_link_libraries(separategraphql PUBLIC graphqlservice)
+target_include_directories(separategraphql PUBLIC
+  $<TARGET_PROPERTY:separateschema,INCLUDE_DIRECTORIES>
+  today)
 
 add_executable(sample today/sample.cpp)
 target_link_libraries(sample PRIVATE
@@ -87,20 +95,25 @@ target_include_directories(sample PRIVATE
 if(GRAPHQL_BUILD_TESTS)
   # tests
   add_library(unifiedschema OBJECT unified/TodaySchema.cpp)
-  target_link_libraries(unifiedschema PUBLIC graphqlservice)
+  add_dependencies(unifiedschema graphqlservice)
   target_include_directories(unifiedschema PUBLIC
     ${CMAKE_CURRENT_BINARY_DIR}/../include
     ${CMAKE_CURRENT_SOURCE_DIR}/../include
     ${CMAKE_CURRENT_SOURCE_DIR}/../PEGTL/include
     unified)
-  add_bigobj_flag(unifiedschema)
 
   if(GRAPHQL_UPDATE_SAMPLES)
     # wait for the sample update to complete
     add_dependencies(unifiedschema update_samples)
   endif()
 
-  add_library(unifiedgraphql today/UnifiedToday.cpp)
-  target_link_libraries(unifiedgraphql PUBLIC unifiedschema)
-  target_include_directories(unifiedgraphql PUBLIC today)
+  add_library(unifiedgraphql
+    today/UnifiedToday.cpp
+    $<TARGET_OBJECTS:unifiedschema>)
+  add_dependencies(unifiedgraphql unifiedschema)
+  target_link_libraries(unifiedgraphql PUBLIC graphqlservice)
+  target_include_directories(unifiedgraphql PUBLIC
+    $<TARGET_PROPERTY:unifiedschema,INCLUDE_DIRECTORIES>
+    today)
+  add_bigobj_flag(unifiedgraphql)
 endif()

samples/CMakeLists.txt

@@ -52,6 +52,7 @@ add_custom_command(
   OUTPUT
     ${CMAKE_CURRENT_BINARY_DIR}/../IntrospectionSchema.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/../include/graphqlservice/IntrospectionSchema.h
+  COMMAND ${CMAKE_COMMAND} -E make_directory include/graphqlservice
   COMMAND schemagen --introspection
   DEPENDS schemagen
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/..
@@ -84,7 +85,7 @@ add_library(graphqlservice
 target_link_libraries(graphqlservice PUBLIC
   graphqlpeg
   Threads::Threads)
-target_include_directories(graphqlservice PRIVATE
+target_include_directories(graphqlservice SYSTEM PRIVATE
   ${CMAKE_CURRENT_BINARY_DIR}/../include)
 
 # RapidJSON is the only option for JSON serialization used in this project, but if you want
@@ -140,15 +141,6 @@ install(FILES
   DESTINATION ${GRAPHQL_INSTALL_INCLUDE_DIR}/graphqlservice
   CONFIGURATIONS Release)
 
-# Enable version checks in find_package
-include(CMakePackageConfigHelpers)
-write_basic_package_version_file(cmake/${PROJECT_NAME}-config-version.cmake COMPATIBILITY SameMajorVersion)
-
-install(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/${PROJECT_NAME}-config.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}-config-version.cmake
-  DESTINATION ${GRAPHQL_INSTALL_CMAKE_DIR}/${PROJECT_NAME})
-
 install(EXPORT cppgraphqlgen-targets
   NAMESPACE cppgraphqlgen::
   DESTINATION ${GRAPHQL_INSTALL_CMAKE_DIR}/${PROJECT_NAME})