Skip to content

fix: build error relating to sourcepp #13

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
JJL772 merged 2 commits into from
Jan 19, 2025
Merged

fix: build error relating to sourcepp #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58c4db0
fix: build error relating to sourcepp
craftablescience Nov 11, 2024
47f97e0
chore: update thirdparty submodules
craftablescience Jan 19, 2025
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
2 changes: 1 addition & 1 deletion src/create.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ auto createFromSteamDepotConfigs( const std::string& configPath, const std::vect
continue;
}

const auto createFromSteamDepotConfig{ [ &configPath, &indexLocation, skipArchives, &fileExcludes, &fileIncludes, &archiveExcludes, &archiveIncludes, &contentRoot ]( const KV1Element& depotBuildConfig ) {
const auto createFromSteamDepotConfig{ [ &configPath, &indexLocation, skipArchives, &fileExcludes, &fileIncludes, &archiveExcludes, &archiveIncludes, &contentRoot ]( const auto& depotBuildConfig ) {
std::vector<std::string> exclusionRegexes;
exclusionRegexes.insert( exclusionRegexes.end(), fileExcludes.begin(), fileExcludes.end() );
for ( int i = 0; i < depotBuildConfig.getChildCount( "FileExclusion" ); i++ ) {
Expand Down
13 changes: 5 additions & 8 deletions src/thirdparty/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@ add_subdirectory( "${CMAKE_CURRENT_LIST_DIR}/argumentum" SYSTEM )
add_subdirectory( "${CMAKE_CURRENT_LIST_DIR}/fmt" SYSTEM )

# sourcepp
set( SOURCEPP_USE_BSPPP OFF CACHE INTERNAL "" )
set( SOURCEPP_USE_DMXPP OFF CACHE INTERNAL "" )
set( SOURCEPP_USE_FGDPP OFF CACHE INTERNAL "" )
set( SOURCEPP_USE_GAMEPP OFF CACHE INTERNAL "" )
set( SOURCEPP_USE_MDLPP OFF CACHE INTERNAL "" )
set( SOURCEPP_USE_STEAMPP OFF CACHE INTERNAL "" )
set( SOURCEPP_USE_VICEPP OFF CACHE INTERNAL "" )
set( SOURCEPP_USE_VTFPP OFF CACHE INTERNAL "" )
set( SOURCEPP_LIBS_START_ENABLED OFF CACHE INTERNAL "" FORCE )
set( SOURCEPP_USE_KVPP ON CACHE INTERNAL "" FORCE )
set( SOURCEPP_USE_VPKPP ON CACHE INTERNAL "" FORCE )
# We don't really need support for this, get rid of the bloat!
set( SOURCEPP_VPKPP_SUPPORT_VPK_V54 OFF CACHE INTERNAL "" FORCE )
add_subdirectory( "${CMAKE_CURRENT_LIST_DIR}/sourcepp" SYSTEM )
2 changes: 1 addition & 1 deletion src/thirdparty/fmt
Open in desktop
Submodule fmt updated 54 files
+6 −0 .clang-format
+5 −3 .github/workflows/cifuzz.yml
+1 −1 .github/workflows/doc.yml
+7 −5 .github/workflows/lint.yml
+15 −13 .github/workflows/linux.yml
+6 −2 .github/workflows/macos.yml
+3 −3 .github/workflows/scorecard.yml
+4 −9 .github/workflows/windows.yml
+23 −14 CMakeLists.txt
+267 −0 ChangeLog.md
+1 −0 README.md
+46 −23 doc/api.md
+1 −1 doc/get-started.md
+2 −2 doc/index.md
+4 −5 doc/syntax.md
+20 −28 include/fmt/args.h
+1,949 −2,073 include/fmt/base.h
+361 −461 include/fmt/chrono.h
+15 −16 include/fmt/color.h
+45 −18 include/fmt/compile.h
+64 −43 include/fmt/format-inl.h
+994 −1,121 include/fmt/format.h
+42 −54 include/fmt/os.h
+43 −88 include/fmt/ostream.h
+107 −130 include/fmt/printf.h
+95 −129 include/fmt/ranges.h
+72 −47 include/fmt/std.h
+97 −46 include/fmt/xchar.h
+11 −1 src/fmt.cc
+4 −1 src/format.cc
+6 −11 src/os.cc
+311 −290 support/python/mkdocstrings_handlers/cxx/__init__.py
+31 −61 support/release.py
+2 −1 test/CMakeLists.txt
+14 −0 test/args-test.cc
+126 −133 test/base-test.cc
+40 −15 test/chrono-test.cc
+1 −27 test/compile-error-test/CMakeLists.txt
+39 −4 test/compile-test.cc
+2 −2 test/format-impl-test.cc
+129 −24 test/format-test.cc
+19 −11 test/gtest/gmock-gtest-all.cc
+24 −10 test/gtest/gmock/gmock.h
+4 −3 test/gtest/gtest/gtest.h
+24 −0 test/no-builtin-types-test.cc
+1 −1 test/os-test.cc
+13 −13 test/ranges-test.cc
+3 −3 test/scan-test.cc
+5 −5 test/scan.h
+20 −4 test/std-test.cc
+1 −1 test/test-assert.h
+1 −1 test/unicode-test.cc
+4 −5 test/util.cc
+23 −105 test/xchar-test.cc
2 changes: 1 addition & 1 deletion src/thirdparty/sourcepp
Open in desktop
Submodule sourcepp updated 356 files