Skip to content

Commit

Permalink
Fix typo: "nonstd-light" -> "nonstd-lite"
Browse files Browse the repository at this point in the history
  • Loading branch information
flexferrum committed Oct 27, 2018
1 parent 2daa2fc commit ac84be9
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 9 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,9 @@
path = thirdparty/boost
url = https://github.com/Manu343726/boost-cmake.git
branch = master
[submodule "thirdparty/nonstd/expected-lite"]
path = thirdparty/nonstd/expected-lite
url = https://github.com/martinmoene/expected-lite.git
[submodule "thirdparty/nonstd/variant-lite"]
path = thirdparty/nonstd/variant-lite
url = https://github.com/martinmoene/variant-lite.git
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ install(TARGETS ${LIB_TARGET_NAME}
ARCHIVE DESTINATION lib/static)

install (DIRECTORY include/ DESTINATION include)
install (DIRECTORY thirdparty/nonstd/expected-light/include/ DESTINATION include)
install (DIRECTORY thirdparty/nonstd/variant-light/include/ DESTINATION include)
install (DIRECTORY thirdparty/nonstd/expected-lite/include/ DESTINATION include)
install (DIRECTORY thirdparty/nonstd/variant-lite/include/ DESTINATION include)
install (DIRECTORY thirdparty/nonstd/value-ptr-lite/include/ DESTINATION include)
install (FILES cmake/public/FindJinja2Cpp.cmake DESTINATION cmake)
2 changes: 0 additions & 2 deletions include/jinja2cpp/error_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

#include "value.h"

#include <nonstd/optional.hpp>

#include <iostream>
#include <vector>

Expand Down
10 changes: 5 additions & 5 deletions thirdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ if(expected-lite_FOUND)
imported_target_alias(expected-lite ALIAS expected-lite::expected-lite)
else()
message(STATUS "expected-lite not found, using submodule")
update_submodule(nonstd/expected-light)
add_subdirectory(nonstd/expected-light EXCLUDE_FROM_ALL)
update_submodule(nonstd/expected-lite)
add_subdirectory(nonstd/expected-lite EXCLUDE_FROM_ALL)
endif()

find_package(variant-lite QUIET)
Expand All @@ -40,11 +40,11 @@ if(variant-lite_FOUND AND optional-lite_FOUND)
imported_target_alias(optional-lite ALIAS optional-lite::optional-lite)
else()
message(STATUS "variant-lite or optional-lite not found, using submodule")
update_submodule(nonstd/variant-light)
add_subdirectory(nonstd/variant-light EXCLUDE_FROM_ALL)
update_submodule(nonstd/variant-lite)
add_subdirectory(nonstd/variant-lite EXCLUDE_FROM_ALL)
# There's a bug in the lib, the target does not include the header include dirs.
# See https://github.com/martinmoene/variant-lite/issues/25
target_include_directories(variant-lite INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/nonstd/variant-light/include")
target_include_directories(variant-lite INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/nonstd/variant-lite/include")

# Fake target until we use separated optional-lite as submodule
# See https://github.com/martinmoene/variant-lite/issues/19
Expand Down
1 change: 1 addition & 0 deletions thirdparty/nonstd/expected-lite
Submodule expected-lite added at 6944fb
1 change: 1 addition & 0 deletions thirdparty/nonstd/variant-lite
Submodule variant-lite added at bc3e47

0 comments on commit ac84be9

Please sign in to comment.