diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f1ac75..e24a34a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,10 @@ option(MV_UNITY_BUILD "Combine target source files into batches for faster compi # SpectralView Plugin # ----------------------------------------------------------------------------- set(SVPLUGIN "SpectralViewPlugin") - -PROJECT(${SVPLUGIN}) +PROJECT(${SVPLUGIN} + DESCRIPTION "View plugin for ManiVault for spectral data" + LANGUAGES CXX +) # ----------------------------------------------------------------------------- # CMake Options @@ -15,14 +17,13 @@ PROJECT(${SVPLUGIN}) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32 /EHsc /MP /permissive- /Zc:__cplusplus /W3") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MD") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD") -endif(MSVC) +endif() # ----------------------------------------------------------------------------- # Dependencies @@ -87,7 +88,7 @@ set(WEB set(AUX res/lineplot_resources.qrc - src/SpectralViewPlugin.json + PluginInfo.json ) qt6_add_resources(RESOURCE_FILES res/lineplot_resources.qrc) @@ -113,7 +114,6 @@ target_include_directories(${SVPLUGIN} PRIVATE "${ManiVault_INCLUDE_DIR}") # ----------------------------------------------------------------------------- # Target properties # ----------------------------------------------------------------------------- -# Request C++17 target_compile_features(${SVPLUGIN} PRIVATE cxx_std_20) if(MV_UNITY_BUILD) @@ -147,16 +147,13 @@ add_custom_command(TARGET ${SVPLUGIN} POST_BUILD --prefix ${ManiVault_INSTALL_DIR}/$ ) -set_target_properties(${SVPLUGIN} - PROPERTIES - FOLDER ViewPlugins -) +mv_handle_plugin_config(${SVPLUGIN}) # ----------------------------------------------------------------------------- # Miscellaneous # ----------------------------------------------------------------------------- # Automatically set the debug environment (command + working directory) for MSVC in debug mode -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set_property(TARGET ${SVPLUGIN} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${ManiVault_INSTALL_DIR}/Debug,$,${ManiVault_INSTALL_DIR}/RelWithDebInfo,${ManiVault_INSTALL_DIR}/Release>>) set_property(TARGET ${SVPLUGIN} PROPERTY VS_DEBUGGER_COMMAND $,"${ManiVault_INSTALL_DIR}/Debug/ManiVault Studio.exe",$,"${ManiVault_INSTALL_DIR}/RelWithDebInfo/ManiVault Studio.exe","${ManiVault_INSTALL_DIR}/Release/ManiVault Studio.exe">>) endif() diff --git a/PluginInfo.json b/PluginInfo.json new file mode 100644 index 0000000..e7f7e64 --- /dev/null +++ b/PluginInfo.json @@ -0,0 +1,9 @@ +{ + "name" : "Spectral View", + "version" : { + "plugin" : "1.0.0", + "core" : ["1.3"] + }, + "type" : "View", + "dependencies" : ["Points", "Cluster", "Images"] +} \ No newline at end of file diff --git a/src/SpectralViewPlugin.h b/src/SpectralViewPlugin.h index f3816cb..bb7ddef 100644 --- a/src/SpectralViewPlugin.h +++ b/src/SpectralViewPlugin.h @@ -130,7 +130,7 @@ class SpectralViewPluginFactory : public ViewPluginFactory Q_INTERFACES(mv::plugin::ViewPluginFactory mv::plugin::PluginFactory) Q_OBJECT Q_PLUGIN_METADATA(IID "nl.tudelft.SpectralViewPlugin" - FILE "SpectralViewPlugin.json") + FILE "PluginInfo.json") public: SpectralViewPluginFactory(); diff --git a/src/SpectralViewPlugin.json b/src/SpectralViewPlugin.json deleted file mode 100644 index da46003..0000000 --- a/src/SpectralViewPlugin.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name" : "Spectral View", - "version" : "1", - "dependencies" : ["Points", "Cluster", "Images"] -} \ No newline at end of file