Skip to content

Commit 30f7e84

Browse files
Adding libyaml, string-view-lite and DSResult
1 parent a096875 commit 30f7e84

File tree

5 files changed

+27
-1
lines changed

5 files changed

+27
-1
lines changed

.gitmodules

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,12 @@
3131
[submodule "MacroPowerToys"]
3232
path = External/MacroPowerToys
3333
url = https://github.com/Neko-Box-Coder/MacroPowerToys.git
34+
[submodule "libyaml"]
35+
path = External/libyaml
36+
url = https://github.com/Neko-Box-Coder/libyaml.git
37+
[submodule "string-view-lite"]
38+
path = External/string-view-lite
39+
url = https://github.com/martinmoene/string-view-lite.git
40+
[submodule "DSResult"]
41+
path = External/DSResult
42+
url = https://github.com/Neko-Box-Coder/DSResult.git

CMakeLists.txt

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,20 @@ add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/System2")
8888
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/dylib")
8989
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/variant")
9090

91+
set(EXPECTED_BUILD_PACKAGE OFF)
92+
set(BUILD_TESTING OFF)
93+
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/DSResult")
94+
95+
set(BUILD_TESTING ON)
96+
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/libyaml")
97+
set(BUILD_TESTING OFF)
98+
99+
# NOTE: Just include the file. Can't add subdirectory since it install stuff
100+
# add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/string-view-lite")
101+
add_library(string-view-lite INTERFACE)
102+
target_include_directories( string-view-lite INTERFACE
103+
"${CMAKE_CURRENT_LIST_DIR}/External/string-view-lite/include")
104+
91105
# Copy cfgpath.h
92106
configure_file( "${CMAKE_CURRENT_LIST_DIR}/External/cfgpath/cfgpath.h"
93107
"${CMAKE_CURRENT_LIST_DIR}/Include/cfgpath.h" COPYONLY)
@@ -182,7 +196,7 @@ set(RUNCPP2_SOURCE_FILES "${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/Profile.
182196
add_library(runcpp2 STATIC ${RUNCPP2_SOURCE_FILES})
183197

184198
set(RUNCPP2_PRIVATE_LINK_LIBS ssLogger System2 CppOverride dylib)
185-
set(RUNCPP2_PUBLIC_LINK_LIBS ghc_filesystem ryml::ryml mpark_variant MacroPowerToys)
199+
set(RUNCPP2_PUBLIC_LINK_LIBS ghc_filesystem ryml::ryml mpark_variant MacroPowerToys string-view-lite yaml DSResult)
186200

187201
target_include_directories(runcpp2 PUBLIC "${CMAKE_CURRENT_LIST_DIR}/Include")
188202
target_link_libraries(runcpp2 PRIVATE ${RUNCPP2_PRIVATE_LINK_LIBS})

External/DSResult

Submodule DSResult added at caf5b62

External/libyaml

Submodule libyaml added at 453b582

External/string-view-lite

Submodule string-view-lite added at d46fe4d

0 commit comments

Comments
 (0)