diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f0b0c55..20374a8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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 $ DESTINATION bin/dlls) # this is done by modorganizer itself now # diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json deleted file mode 100644 index a8aa053..0000000 --- a/vcpkg-configuration.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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-*"] - } - ] -} diff --git a/vcpkg.json b/vcpkg.json index a98f8d8..b680d66 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -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-*"] + } + ] } }