Skip to content

Commit

Permalink
Move cpp-steam-tools to git submodule for compatibility with flatpak …
Browse files Browse the repository at this point in the history
…which doesn't work with cmake fetch content
  • Loading branch information
streetpea committed Mar 16, 2024
1 parent 4098a8b commit 0ca61e5
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 15 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
[submodule "switch/borealis"]
path = switch/borealis
url = https://git.sr.ht/~thestr4ng3r/borealis
[submodule "third-party/cpp-steam-tools"]
path = third-party/cpp-steam-tools
url = https://github.com/nikorag/cpp-steam-tools.git
14 changes: 0 additions & 14 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -129,20 +129,6 @@ endif()

if(CHIAKI_ENABLE_STEAM_SHORTCUT)
message(STATUS "Steam shortcut enabled")
include(FetchContent)

FetchContent_Declare(
cpp-steam-tools
GIT_REPOSITORY https://github.com/nikorag/cpp-steam-tools.git
GIT_TAG main #this can be any tag, revision or branch
)
FetchContent_GetProperties(cpp-steam-tools)

if(NOT cpp-steam-tools_POPULATED)
message(STATUS "Fetching cpp-steam-tools...")
FetchContent_Populate(cpp-steam-tools)
add_subdirectory(${cpp-steam-tools_SOURCE_DIR} ${cpp-steam-tools_BINARY_DIR})
endif()
else()
message(STATUS "Steam shortcut disabled")
endif()
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-appimage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ chmod +x linuxdeploy-x86_64.AppImage
curl -L -O https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
chmod +x linuxdeploy-plugin-qt-x86_64.AppImage

export LD_LIBRARY_PATH="${QT_PATH}/${QT_VERSION}/gcc_64/lib:$(pwd)/../build_appimage/_deps/cpp-steam-tools-build:$LD_LIBRARY_PATH"
export LD_LIBRARY_PATH="${QT_PATH}/${QT_VERSION}/gcc_64/lib:$LD_LIBRARY_PATH"
export QML_SOURCES_PATHS="$(pwd)/../gui/src/qml"

./linuxdeploy-x86_64.AppImage \
Expand Down
4 changes: 4 additions & 0 deletions third-party/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,7 @@ if(NOT CHIAKI_USE_SYSTEM_JERASURE)

add_library(Jerasure::Jerasure ALIAS jerasure)
endif()

if(CHIAKI_ENABLE_STEAM_SHORTCUT)
add_subdirectory(cpp-steam-tools)
endif()
1 change: 1 addition & 0 deletions third-party/cpp-steam-tools
Submodule cpp-steam-tools added at f9b354

0 comments on commit 0ca61e5

Please sign in to comment.