Skip to content

Commit

Permalink
Deploy QtConcurrent DLL not deployed by MO2.
Browse files Browse the repository at this point in the history
  • Loading branch information
Holt59 committed Oct 13, 2024
1 parent d28fcff commit d96f96c
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 29 deletions.
3 changes: 2 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ target_link_libraries(bsa_packer PRIVATE mo2::uibase Qt6::Concurrent mo2::libbsa
target_include_directories(bsa_packer PRIVATE ${BEXT_DI_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_definitions(bsa_packer PRIVATE BSAPACKER_LIBRARY)

mo2_install_plugin(bsa_packer)
# need to deploy this here as MO2 does not depends on Qt6::Concurrent
install(FILES $<TARGET_FILE:Qt6::Concurrent> DESTINATION bin/dlls)

# this is done by modorganizer itself now
#
Expand Down
21 changes: 0 additions & 21 deletions vcpkg-configuration.json

This file was deleted.

33 changes: 26 additions & 7 deletions vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,34 @@
{
"dependencies": [
"mo2-cmake",
"mo2-libbsarch",
"mo2-dds-header",
"directxtex",
"bext-di"
],
"dependencies": ["mo2-libbsarch", "mo2-dds-header", "directxtex", "bext-di"],
"features": {
"standalone": {
"description": "Build Standalone.",
"dependencies": ["mo2-cmake"]
},
"testing": {
"description": "Build BSA Packer tests.",
"dependencies": ["gtest"]
}
},
"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-*", "bext-*"]
},
{
"kind": "git",
"repository": "https://github.com/ModOrganizer2/vcpkg-registry",
"baseline": "b826771be1e4507f28daffa5f2d8ae0bcfa7bf13",
"packages": ["mo2-*"]
}
]
}
}

0 comments on commit d96f96c

Please sign in to comment.