Merge pull request #2 from AnyarInc/master

Merge
mwalcott3 · Mar 27, 2020 · 5c08321 · 5c08321
2 parents 10a49d8 + 0976d03
commit 5c08321
Show file tree

Hide file tree

Showing 4 changed files with 17,699 additions and 69 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,14 +15,15 @@ endif()
 add_library(${PROJECT_NAME} INTERFACE)
 add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
-target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_14)
+target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_17)
 if (MSVC)
  target_compile_options(${PROJECT_NAME} INTERFACE "/bigobj") # for ChaiScript
 endif()
 
 target_include_directories(
  ${PROJECT_NAME}
  INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/catch2>
  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 
 install(TARGETS ${PROJECT_NAME}