Skip to content
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.

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

Move to VCPKG. #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 35 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,47 @@
name: Build Preview BSA Plugin
name: Build Preview BSA

on:
push:
branches: master
pull_request:
types: [opened, synchronize, reopened]

env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"

jobs:
build:
runs-on: windows-2022
steps:
- name: Build Preview BSA Plugin
uses: ModOrganizer2/build-with-mob-action@master
# https://learn.microsoft.com/en-us/vcpkg/consume/binary-caching-github-actions-cache
- name: Export GitHub Actions cache environment variables
uses: actions/github-script@v7
with:
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');

- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
mo2-third-parties: zlib boost lz4 DirectXTex
mo2-dependencies: cmake_common uibase bsatk
setup-python: false
version: 6.7.0
modules:
cache: true

- uses: actions/checkout@v4

- name: "Set environmental variables"
shell: bash
run: |
echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> $GITHUB_ENV

- name: Configure Preview BSA
shell: pwsh
run: |
cmake --preset vs2022-windows-standalone `
"-DCMAKE_PREFIX_PATH=${env:QT_ROOT_DIR}\msvc2019_64" `
"-DCMAKE_INSTALL_PREFIX=install"

- name: Build Preview BSA
run: cmake --build vsbuild --config RelWithDebInfo --target INSTALL
6 changes: 0 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
cmake_minimum_required(VERSION 3.16)

if(DEFINED DEPENDENCIES_DIR)
include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/mo2.cmake)
else()
include(${CMAKE_CURRENT_LIST_DIR}/../cmake_common/mo2.cmake)
endif()

project(preview_bsa)
add_subdirectory(src)
60 changes: 60 additions & 0 deletions CMakePresets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"configurePresets": [
{
"errors": {
"deprecated": true
},
"hidden": true,
"name": "cmake-dev",
"warnings": {
"deprecated": true,
"dev": true
}
},
{
"cacheVariables": {
"VCPKG_MANIFEST_NO_DEFAULT_FEATURES": {
"type": "BOOL",
"value": "ON"
}
},
"toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
"hidden": true,
"name": "vcpkg"
},
{
"hidden": true,
"inherits": ["vcpkg"],
"name": "vcpkg-dev"
},
{
"binaryDir": "${sourceDir}/vsbuild",
"architecture": {
"strategy": "set",
"value": "x64"
},
"cacheVariables": {
"CMAKE_CXX_FLAGS": "/EHsc /MP /W4",
"VCPKG_TARGET_TRIPLET": {
"type": "STRING",
"value": "x64-windows-static-md"
}
},
"generator": "Visual Studio 17 2022",
"inherits": ["cmake-dev", "vcpkg-dev"],
"name": "vs2022-windows",
"toolset": "v143"
},
{
"cacheVariables": {
"VCPKG_MANIFEST_FEATURES": {
"type": "STRING",
"value": "standalone"
}
},
"inherits": "vs2022-windows",
"name": "vs2022-windows-standalone"
}
],
"version": 4
}
14 changes: 12 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
cmake_minimum_required(VERSION 3.16)

find_package(mo2-cmake CONFIG REQUIRED)
find_package(mo2-uibase CONFIG REQUIRED)

find_package(ZLIB REQUIRED)
find_package(lz4 CONFIG REQUIRED)
find_package(Boost CONFIG REQUIRED COMPONENTS thread interprocess)
find_package(mo2-dds-header CONFIG REQUIRED)
find_package(mo2-bsatk CONFIG REQUIRED)

add_library(preview_bsa SHARED)
mo2_configure_plugin(preview_bsa WARNINGS OFF PRIVATE_DEPENDS DirectXTex bsatk)
mo2_install_target(preview_bsa)
mo2_configure_plugin(preview_bsa WARNINGS 4)
target_link_libraries(preview_bsa PRIVATE mo2::uibase mo2::bsatk)
mo2_install_plugin(preview_bsa)
12 changes: 6 additions & 6 deletions src/previewbsa.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Bsa Preview plugin. If not, see <http://www.gnu.org/licenses/>.
*/
#define QT

#include "previewbsa.h"
#include "simplefiletreemodel.h"

#include <QApplication>
#include <QFileInfo>
#include <QImageReader>
Expand All @@ -32,10 +30,12 @@ along with Bsa Preview plugin. If not, see <http://www.gnu.org/licenses/>.
#include <QTreeWidget>
#include <QVBoxLayout>
#include <QtPlugin>
#include <filterwidget.h>
#include <utility.h>

#include <log.h>
#include <uibase/filterwidget.h>
#include <uibase/log.h>
#include <uibase/utility.h>

#include "simplefiletreemodel.h"

using namespace MOBase;

Expand Down
5 changes: 3 additions & 2 deletions src/previewbsa.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ along with bsa Preview plugin. If not, see <http://www.gnu.org/licenses/>.
#define PREVIEWBSA_H

#include <functional>
#include <ipluginpreview.h>

#include <bsatk.h>
#include <bsatk/bsatk.h>

#include <uibase/ipluginpreview.h>

class PreviewBsa : public MOBase::IPluginPreview
{
Expand Down
3 changes: 1 addition & 2 deletions src/simplefiletreemodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,7 @@ int SimpleFileTreeModel::rowCount(const QModelIndex& parent) const
return parentItem->childCount();
}

void SimpleFileTreeModel::setupModelData(const QStringList& lines,
SimpleFileTreeItem* parent)
void SimpleFileTreeModel::setupModelData(const QStringList& lines, SimpleFileTreeItem*)
{
for (QString line : lines) {
auto fullPath = QDir::cleanPath(line);
Expand Down
3 changes: 2 additions & 1 deletion src/simplefiletreemodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
#include <QLineEdit>
#include <QModelIndex>
#include <QVariant>
#include <filterwidget.h>

#include <uibase/filterwidget.h>

using namespace MOBase;

Expand Down
37 changes: 37 additions & 0 deletions vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"dependencies": [
"mo2-dds-header",
"zlib",
"lz4",
"mo2-dds-header",
"boost-interprocess",
"boost-thread"
],
"features": {
"standalone": {
"description": "Build Standalone.",
"dependencies": ["mo2-cmake", "mo2-uibase", "mo2-bsatk"]
}
},
"vcpkg-configuration": {
"default-registry": {
"kind": "git",
"repository": "https://github.com/Microsoft/vcpkg",
"baseline": "f61a294e765b257926ae9e9d85f96468a0af74e7"
},
"registries": [
{
"kind": "git",
"repository": "https://github.com/Microsoft/vcpkg",
"baseline": "f61a294e765b257926ae9e9d85f96468a0af74e7",
"packages": ["boost*", "boost-*"]
},
{
"kind": "git",
"repository": "https://github.com/ModOrganizer2/vcpkg-registry",
"baseline": "70c0aacd6962073dae6e46c2e810c91aa755d2e2",
"packages": ["mo2-*", "pybind11", "spdlog"]
}
]
}
}
Loading