Skip to content

Commit

Permalink
Added vcpkg install/setup
Browse files Browse the repository at this point in the history
  • Loading branch information
grodansparadis committed Jan 31, 2025
1 parent 2860033 commit 63f1015
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
24 changes: 13 additions & 11 deletions .github/workflows/msbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,20 @@ jobs:
# Install latest CMake.
- name: Get latest CMake and ninja
uses: lukka/get-cmake@latest
with:
# Just install vcpkg for now, do not install any ports in this step yet.
setupOnly: true
# Location of the vcpkg as submodule of the repository.
vcpkgDirectory: '${{github.workspace}}/vcpkg/'
# Since the cache must be invalidated when content of the vcpkg.json file changes, let's
# compute its hash and append this to the computed cache's key.
appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }}
vcpkgTriplet: '${{ env.TRIPLET }}'
# Ensure the vcpkg artifacts are cached, they are generated in the 'CMAKE_BINARY_DIR/vcpkg_installed'.
additionalCachedPaths: '${{ env.buildDir }}/vcpkg_installed'


# Setup vcpkg: ensures vcpkg is downloaded and built.
# Since vcpkg.json is being used later on to install the packages
# when `run-cmake` runs, no packages are installed at this time
# (and vcpkg does not run).
- name: Setup anew (or from cache) vcpkg (and does not build any package)
uses: lukka/run-vcpkg@v11
with:
vcpkgDirectory: '${{github.workspace}}/vcpkg/'
vcpkgTriplet: '${{ env.TRIPLET }}'
# Ensure the vcpkg artifacts are cached, they are generated in the 'CMAKE_BINARY_DIR/vcpkg_installed'.
additionalCachedPaths: '${{ env.buildDir }}/vcpkg_installed'

- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v2
with:
Expand Down
4 changes: 1 addition & 3 deletions src/cfrmsession.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,7 @@ CFrmSession::CFrmSession(QWidget* parent, json* pconn)
SLOT(rxSelectionChange(const QItemSelection&, const QItemSelection&)));

// Handle help requests
// QAction *helpAction;
// helpAction->setShortcut(QKeySequence::HelpContents);
// connect(helpAction, &QAction::triggered, this, &CFrmSession::showHelp);

QShortcut * shortcut = new QShortcut(QKeySequence(Qt::Key_F1),this,SLOT(showHelp()));
shortcut->setAutoRepeat(false);

Expand Down

0 comments on commit 63f1015

Please sign in to comment.