Skip to content
Merged
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
32 changes: 9 additions & 23 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ PROJECT(${PROJECT} C CXX)
# -----------------------------------------------------------------------------
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)

set(CMAKE_INCLUDE_CURRENT_DIR ON)

set(CMAKE_CXX_STANDARD_REQUIRED ON)

if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
Expand Down Expand Up @@ -81,10 +83,6 @@ set(PLUGIN_SOURCES
src/OmeHelper.h
)

set(PLUGIN_MOC_HEADERS
src/ImageLoaderPlugin.h
)

set(WIDGET_SOURCES
src/ImageLoaderDialog.h
src/ImageLoaderDialog.cpp
Expand Down Expand Up @@ -125,39 +123,30 @@ set(ACTION_SOURCES
src/MirrorAction.cpp
)

set(AUX src/ImageLoaderPlugin.json)

file(GLOB UIS src/*.ui)

set(AUX src/ImageLoaderPlugin.json)
set(AUX
PluginInfo.json
)

set(SOURCES
${PLUGIN_SOURCES}
${LOADER_SOURCES}
${SCANNER_SOURCES}
${WIDGET_SOURCES}
${MODEL_SOURCES}
${ACTION_SOURCES}
)

source_group(Plugin FILES ${PLUGIN_SOURCES} ${AUX})
source_group(Plugin FILES ${PLUGIN_SOURCES})
source_group(Widgets FILES ${WIDGET_SOURCES})
source_group(Actions FILES ${ACTION_SOURCES})
source_group(UI FILES ${UIS})
source_group(Aux FILES ${AUX})

QT6_WRAP_UI(UI_HEADERS ${UIS})

# -----------------------------------------------------------------------------
# CMake Target
# -----------------------------------------------------------------------------
add_library(${PROJECT} SHARED ${SOURCES} ${UIS} ${AUX})
add_library(${PROJECT} SHARED ${SOURCES} ${AUX})

# -----------------------------------------------------------------------------
# Target include directories
# -----------------------------------------------------------------------------
target_include_directories(${PROJECT} PRIVATE "${ManiVault_INCLUDE_DIR}")
target_include_directories(${PROJECT} PRIVATE src)

# -----------------------------------------------------------------------------
# Target properties
Expand Down Expand Up @@ -200,10 +189,7 @@ add_custom_command(TARGET ${PROJECT} POST_BUILD
--prefix ${ManiVault_INSTALL_DIR}/$<CONFIGURATION>
)

set_target_properties(${PROJECT}
PROPERTIES
FOLDER LoaderPlugins
)
mv_handle_plugin_config(${PROJECT})

# -----------------------------------------------------------------------------
# Miscellaneous
Expand Down
10 changes: 10 additions & 0 deletions PluginInfo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name" : "Image Loader",
"menuName" : "Images",
"version" : {
"plugin" : "0.1.0",
"core" : ["1.3"]
},
"type" : "Loader",
"dependencies" : ["Images"]
}
2 changes: 1 addition & 1 deletion src/ImageLoaderPlugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using namespace mv;
using namespace mv::plugin;

Q_PLUGIN_METADATA(IID "nl.BioVault.ImageLoaderPlugin")
Q_PLUGIN_METADATA(IID "studio.manivault.ImageLoaderPlugin")

ImageLoaderPlugin::ImageLoaderPlugin(const PluginFactory* factory) :
LoaderPlugin(factory),
Expand Down
3 changes: 2 additions & 1 deletion src/ImageLoaderPlugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ class ImageLoaderPluginFactory : public LoaderPluginFactory
{
Q_INTERFACES(mv::plugin::LoaderPluginFactory mv::plugin::PluginFactory)
Q_OBJECT
Q_PLUGIN_METADATA(IID "nl.BioVault.ImageLoaderPlugin" FILE "ImageLoaderPlugin.json")
Q_PLUGIN_METADATA(IID "studio.manivault.ImageLoaderPlugin"
FILE "PluginInfo.json")

public:
/** Default constructor */
Expand Down
6 changes: 0 additions & 6 deletions src/ImageLoaderPlugin.json

This file was deleted.