Skip to content

Separating git and local source options #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Neko-Box-Coder merged 1 commit into from
Nov 30, 2024
Merged

Separating git and local source options #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@
[submodule "CppOverride"]
path = External/CppOverride
url = https://github.com/Neko-Box-Coder/CppOverride.git
[submodule "variant"]
path = External/variant
url = https://github.com/mpark/variant.git
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/rapidyaml")
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/filesystem")
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/System2")
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/dylib")
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/variant")

# Copy cfgpath.h
configure_file( "${CMAKE_CURRENT_LIST_DIR}/External/cfgpath/cfgpath.h"
Expand Down Expand Up @@ -124,6 +125,8 @@ add_library(runcpp2 STATIC
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/DependencyInfo.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/DependencyLinkProperty.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/DependencySource.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/GitSource.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/LocalSource.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/FileProperties.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/FlagsOverrideInfo.cpp"
"${CMAKE_CURRENT_LIST_DIR}/Src/runcpp2/Data/ProfilesCommands.cpp"
Expand All @@ -150,7 +153,7 @@ add_library(runcpp2 STATIC

target_include_directories(runcpp2 PUBLIC "${CMAKE_CURRENT_LIST_DIR}/Include")
target_link_libraries(runcpp2 PRIVATE ssLogger System2 CppOverride dylib)
target_link_libraries(runcpp2 PUBLIC ghc_filesystem ryml::ryml)
target_link_libraries(runcpp2 PUBLIC ghc_filesystem ryml::ryml mpark_variant)

if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(STANDARD_COMPILE_FLAGS "/utf-8;/W1;/DGHC_WIN_DISABLE_WSTRING_STORAGE_TYPE=1")
Expand Down
14 changes: 9 additions & 5 deletions DefaultYAMLs/DefaultScriptInfo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,16 @@ Dependencies:
# The source of getting the dependency (Git, Local)
Source:
# Git: Dependency exists in a git server, and needs to be cloned
# Local: Dependency exists in local filesystem
Type: Git
Git:
# Git repository URL
URL: "https://github.com/MyUser/MyLibrary.git"

# Git URL for Git type, path to a directory for Local type
Value: "https://github.com/MyUser/MyLibrary.git"

# Local: Dependency exists in local filesystem
# Local:
# # Path to the library directory
# Path: "./libs/LocalLibrary"


# Library Type (Static, Object, Shared, Header)
LibraryType: Static

Expand Down
192 changes: 0 additions & 192 deletions DefaultYAMLs/OldScriptInfoSchema.json
View file
Open in desktop

This file was deleted.

Loading