Remove metadata.json from packaging. Fix liblib naming. Export via #lib package.

This commit is contained in:
Alejandro Cabeza Romero 2026-02-05 12:24:46 +01:00
parent ee5805690c
commit e1efea3ec5
No known key found for this signature in database
GPG Key ID: DA3D14AE478030FD
2 changed files with 9 additions and 8 deletions

View File

@ -150,13 +150,12 @@ add_library(logos_cpp_sdk INTERFACE)
target_include_directories(logos_cpp_sdk INTERFACE "${SDK_INC}") target_include_directories(logos_cpp_sdk INTERFACE "${SDK_INC}")
# ---- Plugin ---- # ---- Plugin ----
set(PLUGIN_TARGET liblogos-blockchain-module) set(PLUGIN_TARGET logos-blockchain-module)
qt_add_plugin(${PLUGIN_TARGET} CLASS_NAME LogosBlockchainModule) qt_add_plugin(${PLUGIN_TARGET} CLASS_NAME LogosBlockchainModule)
target_sources(${PLUGIN_TARGET} PRIVATE target_sources(${PLUGIN_TARGET} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/src/logos_blockchain_module.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/logos_blockchain_module.cpp
${CMAKE_CURRENT_SOURCE_DIR}/metadata.json
) )
set_property(TARGET ${PLUGIN_TARGET} PROPERTY PUBLIC_HEADER set_property(TARGET ${PLUGIN_TARGET} PROPERTY PUBLIC_HEADER

View File

@ -82,7 +82,7 @@
}; };
in in
{ {
logos-blockchain-module = logosBlockchainModule; lib = logosBlockchainModule;
default = logosBlockchainModule; default = logosBlockchainModule;
} }
); );
@ -91,21 +91,23 @@
system: system:
let let
pkgs = mkPkgs system; pkgs = mkPkgs system;
logosBlockchainModule = self.packages.${system}.logos-blockchain-module; logosBlockchainModuleLib = self.packages.${system}.lib;
logosModuleViewer = logos-module-viewer.packages.${system}.default; logosModuleViewer = logos-module-viewer.packages.${system}.default;
extension = if pkgs.stdenv.isDarwin then "dylib" extension = if pkgs.stdenv.isDarwin then "dylib"
else if pkgs.stdenv.hostPlatform.isWindows then "dll" else if pkgs.stdenv.hostPlatform.isWindows then "dll"
else "so"; else "so";
in inspectModule = {
{
default = {
type = "app"; type = "app";
program = program =
"${pkgs.writeShellScriptBin "inspect-module" '' "${pkgs.writeShellScriptBin "inspect-module" ''
exec ${logosModuleViewer}/bin/logos-module-viewer \ exec ${logosModuleViewer}/bin/logos-module-viewer \
--module ${logosBlockchainModule}/lib/liblogos-blockchain-module.${extension} --module ${logosBlockchainModuleLib}/lib/liblogos-blockchain-module.${extension}
''}/bin/inspect-module"; ''}/bin/inspect-module";
}; };
in
{
inspect-module = inspectModule;
default = inspectModule;
} }
); );