Skip to content

Commit ac84be9

Browse files
committed
Fix typo: "nonstd-light" -> "nonstd-lite"
1 parent 2daa2fc commit ac84be9

File tree

6 files changed

+15
-9
lines changed

6 files changed

+15
-9
lines changed

.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,9 @@
88
path = thirdparty/boost
99
url = https://github.com/Manu343726/boost-cmake.git
1010
branch = master
11+
[submodule "thirdparty/nonstd/expected-lite"]
12+
path = thirdparty/nonstd/expected-lite
13+
url = https://github.com/martinmoene/expected-lite.git
14+
[submodule "thirdparty/nonstd/variant-lite"]
15+
path = thirdparty/nonstd/variant-lite
16+
url = https://github.com/martinmoene/variant-lite.git

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ install(TARGETS ${LIB_TARGET_NAME}
112112
ARCHIVE DESTINATION lib/static)
113113

114114
install (DIRECTORY include/ DESTINATION include)
115-
install (DIRECTORY thirdparty/nonstd/expected-light/include/ DESTINATION include)
116-
install (DIRECTORY thirdparty/nonstd/variant-light/include/ DESTINATION include)
115+
install (DIRECTORY thirdparty/nonstd/expected-lite/include/ DESTINATION include)
116+
install (DIRECTORY thirdparty/nonstd/variant-lite/include/ DESTINATION include)
117117
install (DIRECTORY thirdparty/nonstd/value-ptr-lite/include/ DESTINATION include)
118118
install (FILES cmake/public/FindJinja2Cpp.cmake DESTINATION cmake)

include/jinja2cpp/error_info.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
#include "value.h"
55

6-
#include <nonstd/optional.hpp>
7-
86
#include <iostream>
97
#include <vector>
108

thirdparty/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ if(expected-lite_FOUND)
2929
imported_target_alias(expected-lite ALIAS expected-lite::expected-lite)
3030
else()
3131
message(STATUS "expected-lite not found, using submodule")
32-
update_submodule(nonstd/expected-light)
33-
add_subdirectory(nonstd/expected-light EXCLUDE_FROM_ALL)
32+
update_submodule(nonstd/expected-lite)
33+
add_subdirectory(nonstd/expected-lite EXCLUDE_FROM_ALL)
3434
endif()
3535

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

4949
# Fake target until we use separated optional-lite as submodule
5050
# See https://github.com/martinmoene/variant-lite/issues/19

thirdparty/nonstd/expected-lite

Submodule expected-lite added at 6944fb2

thirdparty/nonstd/variant-lite

Submodule variant-lite added at bc3e47d

0 commit comments

Comments
 (0)