From 07b718e23d443c1999afba586d8bb6755b18c10a Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 4 Jun 2025 17:21:09 +0200 Subject: [PATCH 1/3] Rename plugin info files --- ExampleAnalysis/CMakeLists.txt | 2 +- .../{src/ExampleAnalysisPlugin.json => PluginInfo.json} | 0 ExampleAnalysis/src/ExampleAnalysisPlugin.h | 2 +- ExampleData/CMakeLists.txt | 2 +- ExampleData/{src/ExampleDataPlugin.json => PluginInfo.json} | 0 ExampleData/src/ExampleDataPlugin.h | 2 +- .../{src/ExampleDependenciesPlugin.json => PluginInfo.json} | 0 ExampleDependencies/src/ExampleDependenciesPlugin.h | 2 +- ExampleLoader/CMakeLists.txt | 2 +- ExampleLoader/{src/ExampleLoaderPlugin.json => PluginInfo.json} | 0 ExampleLoader/src/ExampleLoaderPlugin.h | 2 +- ExampleTransformation/CMakeLists.txt | 2 +- .../{src/ExampleTransformationPlugin.json => PluginInfo.json} | 0 ExampleTransformation/src/ExampleTransformationPlugin.h | 2 +- ExampleView/CMakeLists.txt | 2 +- ExampleView/{src/ExampleViewPlugin.json => PluginInfo.json} | 0 ExampleView/src/ExampleViewPlugin.h | 2 +- ExampleViewJS/CMakeLists.txt | 2 +- ExampleViewJS/{src/ExampleViewJSPlugin.json => PluginInfo.json} | 0 ExampleViewJS/src/ExampleViewJSPlugin.h | 2 +- ExampleViewOpenGL/CMakeLists.txt | 2 +- .../{src/ExampleViewGLPlugin.json => PluginInfo.json} | 0 ExampleViewOpenGL/src/ExampleViewGLPlugin.h | 2 +- ExampleWriter/CMakeLists.txt | 2 +- ExampleWriter/{src/ExampleWriterPlugin.json => PluginInfo.json} | 0 ExampleWriter/src/ExampleWriterPlugin.h | 2 +- 26 files changed, 17 insertions(+), 17 deletions(-) rename ExampleAnalysis/{src/ExampleAnalysisPlugin.json => PluginInfo.json} (100%) rename ExampleData/{src/ExampleDataPlugin.json => PluginInfo.json} (100%) rename ExampleDependencies/{src/ExampleDependenciesPlugin.json => PluginInfo.json} (100%) rename ExampleLoader/{src/ExampleLoaderPlugin.json => PluginInfo.json} (100%) rename ExampleTransformation/{src/ExampleTransformationPlugin.json => PluginInfo.json} (100%) rename ExampleView/{src/ExampleViewPlugin.json => PluginInfo.json} (100%) rename ExampleViewJS/{src/ExampleViewJSPlugin.json => PluginInfo.json} (100%) rename ExampleViewOpenGL/{src/ExampleViewGLPlugin.json => PluginInfo.json} (100%) rename ExampleWriter/{src/ExampleWriterPlugin.json => PluginInfo.json} (100%) diff --git a/ExampleAnalysis/CMakeLists.txt b/ExampleAnalysis/CMakeLists.txt index 8522f03..f3db53a 100644 --- a/ExampleAnalysis/CMakeLists.txt +++ b/ExampleAnalysis/CMakeLists.txt @@ -42,7 +42,7 @@ set(PLUGIN_SOURCES src/ExampleAnalysisPlugin.cpp src/SettingsAction.h src/SettingsAction.cpp - src/ExampleAnalysisPlugin.json + PluginInfo.json ) source_group(Plugin FILES ${PLUGIN_SOURCES}) diff --git a/ExampleAnalysis/src/ExampleAnalysisPlugin.json b/ExampleAnalysis/PluginInfo.json similarity index 100% rename from ExampleAnalysis/src/ExampleAnalysisPlugin.json rename to ExampleAnalysis/PluginInfo.json diff --git a/ExampleAnalysis/src/ExampleAnalysisPlugin.h b/ExampleAnalysis/src/ExampleAnalysisPlugin.h index d024f87..766cd72 100644 --- a/ExampleAnalysis/src/ExampleAnalysisPlugin.h +++ b/ExampleAnalysis/src/ExampleAnalysisPlugin.h @@ -150,7 +150,7 @@ class ExampleAnalysisPluginFactory : public AnalysisPluginFactory Q_INTERFACES(mv::plugin::AnalysisPluginFactory mv::plugin::PluginFactory) Q_OBJECT Q_PLUGIN_METADATA(IID "studio.manivault.ExampleAnalysisPlugin" - FILE "ExampleAnalysisPlugin.json") + FILE "PluginInfo.json") public: diff --git a/ExampleData/CMakeLists.txt b/ExampleData/CMakeLists.txt index 89a30e2..9d0d3f6 100644 --- a/ExampleData/CMakeLists.txt +++ b/ExampleData/CMakeLists.txt @@ -43,7 +43,7 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../Common ${CMAKE_CURRENT_BINARY_DI set(PLUGIN_SOURCES src/ExampleDataPlugin.h src/ExampleDataPlugin.cpp - src/ExampleDataPlugin.json + PluginInfo.json ) set(PLUGIN_HEADERS diff --git a/ExampleData/src/ExampleDataPlugin.json b/ExampleData/PluginInfo.json similarity index 100% rename from ExampleData/src/ExampleDataPlugin.json rename to ExampleData/PluginInfo.json diff --git a/ExampleData/src/ExampleDataPlugin.h b/ExampleData/src/ExampleDataPlugin.h index 540666b..78b040a 100644 --- a/ExampleData/src/ExampleDataPlugin.h +++ b/ExampleData/src/ExampleDataPlugin.h @@ -110,7 +110,7 @@ class ExampleDataPluginFactory : public RawDataFactory Q_INTERFACES(mv::plugin::RawDataFactory mv::plugin::PluginFactory) Q_OBJECT Q_PLUGIN_METADATA(IID "studio.manivault.ExampleDataPlugin" - FILE "ExampleDataPlugin.json") + FILE "PluginInfo.json") public: ExampleDataPluginFactory(); diff --git a/ExampleDependencies/src/ExampleDependenciesPlugin.json b/ExampleDependencies/PluginInfo.json similarity index 100% rename from ExampleDependencies/src/ExampleDependenciesPlugin.json rename to ExampleDependencies/PluginInfo.json diff --git a/ExampleDependencies/src/ExampleDependenciesPlugin.h b/ExampleDependencies/src/ExampleDependenciesPlugin.h index 2c0e3eb..24d2589 100644 --- a/ExampleDependencies/src/ExampleDependenciesPlugin.h +++ b/ExampleDependencies/src/ExampleDependenciesPlugin.h @@ -42,7 +42,7 @@ class ExampleDependenciesPluginFactory : public AnalysisPluginFactory Q_INTERFACES(mv::plugin::AnalysisPluginFactory mv::plugin::PluginFactory) Q_OBJECT Q_PLUGIN_METADATA(IID "studio.manivault.ExampleDependenciesPlugin" - FILE "ExampleDependenciesPlugin.json") + FILE "PluginInfo.json") public: diff --git a/ExampleLoader/CMakeLists.txt b/ExampleLoader/CMakeLists.txt index 4b9651b..ffed20c 100644 --- a/ExampleLoader/CMakeLists.txt +++ b/ExampleLoader/CMakeLists.txt @@ -40,7 +40,7 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../Common ${CMAKE_CURRENT_BINARY_DI set(PLUGIN_SOURCES src/ExampleLoaderPlugin.h src/ExampleLoaderPlugin.cpp - src/ExampleLoaderPlugin.json + PluginInfo.json ) source_group(Plugin FILES ${PLUGIN_SOURCES}) diff --git a/ExampleLoader/src/ExampleLoaderPlugin.json b/ExampleLoader/PluginInfo.json similarity index 100% rename from ExampleLoader/src/ExampleLoaderPlugin.json rename to ExampleLoader/PluginInfo.json diff --git a/ExampleLoader/src/ExampleLoaderPlugin.h b/ExampleLoader/src/ExampleLoaderPlugin.h index 90a1ab3..9013ed4 100644 --- a/ExampleLoader/src/ExampleLoaderPlugin.h +++ b/ExampleLoader/src/ExampleLoaderPlugin.h @@ -33,7 +33,7 @@ class ExampleLoaderPluginFactory : public LoaderPluginFactory Q_INTERFACES(mv::plugin::LoaderPluginFactory mv::plugin::PluginFactory) Q_OBJECT Q_PLUGIN_METADATA(IID "studio.manivault.ExampleLoaderPlugin" - FILE "ExampleLoaderPlugin.json") + FILE "PluginInfo.json") public: ExampleLoaderPluginFactory(); diff --git a/ExampleTransformation/CMakeLists.txt b/ExampleTransformation/CMakeLists.txt index 99a472c..c0df45c 100644 --- a/ExampleTransformation/CMakeLists.txt +++ b/ExampleTransformation/CMakeLists.txt @@ -40,7 +40,7 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../Common ${CMAKE_CURRENT_BINARY_DI set(PLUGIN_SOURCES src/ExampleTransformationPlugin.h src/ExampleTransformationPlugin.cpp - src/ExampleTransformationPlugin.json + PluginInfo.json ) source_group(Plugin FILES ${PLUGIN_SOURCES}) diff --git a/ExampleTransformation/src/ExampleTransformationPlugin.json b/ExampleTransformation/PluginInfo.json similarity index 100% rename from ExampleTransformation/src/ExampleTransformationPlugin.json rename to ExampleTransformation/PluginInfo.json diff --git a/ExampleTransformation/src/ExampleTransformationPlugin.h b/ExampleTransformation/src/ExampleTransformationPlugin.h index 56036a1..6c9df63 100644 --- a/ExampleTransformation/src/ExampleTransformationPlugin.h +++ b/ExampleTransformation/src/ExampleTransformationPlugin.h @@ -90,7 +90,7 @@ class ExampleTransformationPluginFactory : public TransformationPluginFactory Q_INTERFACES(mv::plugin::TransformationPluginFactory mv::plugin::PluginFactory) Q_OBJECT Q_PLUGIN_METADATA(IID "studio.manivault.ExampleTransformationPlugin" - FILE "ExampleTransformationPlugin.json") + FILE "PluginInfo.json") public: diff --git a/ExampleView/CMakeLists.txt b/ExampleView/CMakeLists.txt index 0c4f2ff..0466514 100644 --- a/ExampleView/CMakeLists.txt +++ b/ExampleView/CMakeLists.txt @@ -40,7 +40,7 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../Common ${CMAKE_CURRENT_BINARY_DI set(PLUGIN_SOURCES src/ExampleViewPlugin.h src/ExampleViewPlugin.cpp - src/ExampleViewPlugin.json + PluginInfo.json ) set(PLUGIN_MOC_HEADERS diff --git a/ExampleView/src/ExampleViewPlugin.json b/ExampleView/PluginInfo.json similarity index 100% rename from ExampleView/src/ExampleViewPlugin.json rename to ExampleView/PluginInfo.json diff --git a/ExampleView/src/ExampleViewPlugin.h b/ExampleView/src/ExampleViewPlugin.h index 7c8515b..8dd94c0 100644 --- a/ExampleView/src/ExampleViewPlugin.h +++ b/ExampleView/src/ExampleViewPlugin.h @@ -75,7 +75,7 @@ class ExampleViewPluginFactory : public ViewPluginFactory Q_INTERFACES(mv::plugin::ViewPluginFactory mv::plugin::PluginFactory) Q_OBJECT Q_PLUGIN_METADATA(IID "studio.manivault.ExampleViewPlugin" - FILE "ExampleViewPlugin.json") + FILE "PluginInfo.json") public: diff --git a/ExampleViewJS/CMakeLists.txt b/ExampleViewJS/CMakeLists.txt index 4bf270d..eeaa797 100644 --- a/ExampleViewJS/CMakeLists.txt +++ b/ExampleViewJS/CMakeLists.txt @@ -42,7 +42,7 @@ set(PLUGIN_SOURCES src/ExampleViewJSPlugin.cpp src/ChartWidget.h src/ChartWidget.cpp - src/ExampleViewJSPlugin.json + PluginInfo.json ) set(WEB diff --git a/ExampleViewJS/src/ExampleViewJSPlugin.json b/ExampleViewJS/PluginInfo.json similarity index 100% rename from ExampleViewJS/src/ExampleViewJSPlugin.json rename to ExampleViewJS/PluginInfo.json diff --git a/ExampleViewJS/src/ExampleViewJSPlugin.h b/ExampleViewJS/src/ExampleViewJSPlugin.h index 17be088..d69e148 100644 --- a/ExampleViewJS/src/ExampleViewJSPlugin.h +++ b/ExampleViewJS/src/ExampleViewJSPlugin.h @@ -84,7 +84,7 @@ class ExampleViewJSPluginFactory : public ViewPluginFactory Q_INTERFACES(mv::plugin::ViewPluginFactory mv::plugin::PluginFactory) Q_OBJECT Q_PLUGIN_METADATA(IID "studio.manivault.ExampleViewJSPlugin" - FILE "ExampleViewJSPlugin.json") + FILE "PluginInfo.json") public: diff --git a/ExampleViewOpenGL/CMakeLists.txt b/ExampleViewOpenGL/CMakeLists.txt index 3d9366e..dbd662f 100644 --- a/ExampleViewOpenGL/CMakeLists.txt +++ b/ExampleViewOpenGL/CMakeLists.txt @@ -40,7 +40,7 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../Common ${CMAKE_CURRENT_BINARY_DI set(PLUGIN_SOURCES src/ExampleViewGLPlugin.h src/ExampleViewGLPlugin.cpp - src/ExampleViewGLPlugin.json + PluginInfo.json ) set(PLUGIN_WIDGETS diff --git a/ExampleViewOpenGL/src/ExampleViewGLPlugin.json b/ExampleViewOpenGL/PluginInfo.json similarity index 100% rename from ExampleViewOpenGL/src/ExampleViewGLPlugin.json rename to ExampleViewOpenGL/PluginInfo.json diff --git a/ExampleViewOpenGL/src/ExampleViewGLPlugin.h b/ExampleViewOpenGL/src/ExampleViewGLPlugin.h index 97c6f59..43b0f19 100644 --- a/ExampleViewOpenGL/src/ExampleViewGLPlugin.h +++ b/ExampleViewOpenGL/src/ExampleViewGLPlugin.h @@ -84,7 +84,7 @@ class ExampleViewGLPluginFactory : public ViewPluginFactory Q_INTERFACES(mv::plugin::ViewPluginFactory mv::plugin::PluginFactory) Q_OBJECT Q_PLUGIN_METADATA(IID "studio.manivault.ExampleViewGLPlugin" - FILE "ExampleViewGLPlugin.json") + FILE "PluginInfo.json") public: diff --git a/ExampleWriter/CMakeLists.txt b/ExampleWriter/CMakeLists.txt index 832d3c1..1ea323e 100644 --- a/ExampleWriter/CMakeLists.txt +++ b/ExampleWriter/CMakeLists.txt @@ -40,7 +40,7 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../Common ${CMAKE_CURRENT_BINARY_DI set(PLUGIN_SOURCES src/ExampleWriterPlugin.h src/ExampleWriterPlugin.cpp - src/ExampleWriterPlugin.json + PluginInfo.json ) source_group(Plugin FILES ${PLUGIN_SOURCES}) diff --git a/ExampleWriter/src/ExampleWriterPlugin.json b/ExampleWriter/PluginInfo.json similarity index 100% rename from ExampleWriter/src/ExampleWriterPlugin.json rename to ExampleWriter/PluginInfo.json diff --git a/ExampleWriter/src/ExampleWriterPlugin.h b/ExampleWriter/src/ExampleWriterPlugin.h index d2b404b..8058fc5 100644 --- a/ExampleWriter/src/ExampleWriterPlugin.h +++ b/ExampleWriter/src/ExampleWriterPlugin.h @@ -34,7 +34,7 @@ class ExampleWriterPluginFactory : public WriterPluginFactory Q_INTERFACES(mv::plugin::WriterPluginFactory mv::plugin::PluginFactory) Q_OBJECT Q_PLUGIN_METADATA(IID "studio.manivault.ExampleWriterPlugin" - FILE "ExampleWriterPlugin.json") + FILE "PluginInfo.json") public: ExampleWriterPluginFactory(); From 031e14f44edd5d5e3e07d47894b36dda4784eb00 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 4 Jun 2025 17:22:00 +0200 Subject: [PATCH 2/3] Handle plugin info in cmake --- ExampleAnalysis/CMakeLists.txt | 5 +++++ ExampleData/CMakeLists.txt | 5 +++++ ExampleDependencies/CMakeLists.txt | 5 +++++ ExampleLoader/CMakeLists.txt | 5 +++++ ExampleTransformation/CMakeLists.txt | 5 +++++ ExampleView/CMakeLists.txt | 5 +++++ ExampleViewJS/CMakeLists.txt | 5 +++++ ExampleViewOpenGL/CMakeLists.txt | 5 +++++ ExampleWriter/CMakeLists.txt | 5 +++++ 9 files changed, 45 insertions(+) diff --git a/ExampleAnalysis/CMakeLists.txt b/ExampleAnalysis/CMakeLists.txt index f3db53a..54d945f 100644 --- a/ExampleAnalysis/CMakeLists.txt +++ b/ExampleAnalysis/CMakeLists.txt @@ -99,6 +99,11 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD --prefix ${ManiVault_INSTALL_DIR}/$ ) +# Append plugin version to output file +# 0 disables automatic folder placement (same as plugin type) +# since we want to place all example plugins in a separate folder +mv_handle_plugin_config(${PROJECT_NAME} 0) + # ----------------------------------------------------------------------------- # Miscellaneous # ----------------------------------------------------------------------------- diff --git a/ExampleData/CMakeLists.txt b/ExampleData/CMakeLists.txt index 9d0d3f6..a428562 100644 --- a/ExampleData/CMakeLists.txt +++ b/ExampleData/CMakeLists.txt @@ -120,6 +120,11 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD --prefix ${ManiVault_INSTALL_DIR}/$ ) +# Append plugin version to output file +# 0 disables automatic folder placement (same as plugin type) +# since we want to place all example plugins in a separate folder +mv_handle_plugin_config(${PROJECT_NAME} 0) + # ----------------------------------------------------------------------------- # Miscellaneous # ----------------------------------------------------------------------------- diff --git a/ExampleDependencies/CMakeLists.txt b/ExampleDependencies/CMakeLists.txt index cb65e7e..94a3f33 100644 --- a/ExampleDependencies/CMakeLists.txt +++ b/ExampleDependencies/CMakeLists.txt @@ -151,6 +151,11 @@ set_target_properties(hwy hwy_contrib hwy_list_targets hwy_test # Automatically available when using find_package(ManiVault) mv_install_dependencies(${PROJECT_NAME} "hwy" "hwy_contrib") +# Append plugin version to output file +# 0 disables automatic folder placement (same as plugin type) +# since we want to place all example plugins in a separate folder +mv_handle_plugin_config(${PROJECT_NAME} 0) + # ----------------------------------------------------------------------------- # Miscellaneous # ----------------------------------------------------------------------------- diff --git a/ExampleLoader/CMakeLists.txt b/ExampleLoader/CMakeLists.txt index ffed20c..8baa859 100644 --- a/ExampleLoader/CMakeLists.txt +++ b/ExampleLoader/CMakeLists.txt @@ -96,6 +96,11 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD --prefix ${ManiVault_INSTALL_DIR}/$ ) +# Append plugin version to output file +# 0 disables automatic folder placement (same as plugin type) +# since we want to place all example plugins in a separate folder +mv_handle_plugin_config(${PROJECT_NAME} 0) + # ----------------------------------------------------------------------------- # Miscellaneous # ----------------------------------------------------------------------------- diff --git a/ExampleTransformation/CMakeLists.txt b/ExampleTransformation/CMakeLists.txt index c0df45c..07c6375 100644 --- a/ExampleTransformation/CMakeLists.txt +++ b/ExampleTransformation/CMakeLists.txt @@ -96,6 +96,11 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD --prefix ${ManiVault_INSTALL_DIR}/$ ) +# Append plugin version to output file +# 0 disables automatic folder placement (same as plugin type) +# since we want to place all example plugins in a separate folder +mv_handle_plugin_config(${PROJECT_NAME} 0) + # ----------------------------------------------------------------------------- # Miscellaneous # ----------------------------------------------------------------------------- diff --git a/ExampleView/CMakeLists.txt b/ExampleView/CMakeLists.txt index 0466514..de7cbf4 100644 --- a/ExampleView/CMakeLists.txt +++ b/ExampleView/CMakeLists.txt @@ -100,6 +100,11 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD --prefix ${ManiVault_INSTALL_DIR}/$ ) +# Append plugin version to output file +# 0 disables automatic folder placement (same as plugin type) +# since we want to place all example plugins in a separate folder +mv_handle_plugin_config(${PROJECT_NAME} 0) + # ----------------------------------------------------------------------------- # Miscellaneous # ----------------------------------------------------------------------------- diff --git a/ExampleViewJS/CMakeLists.txt b/ExampleViewJS/CMakeLists.txt index eeaa797..ce56ba6 100644 --- a/ExampleViewJS/CMakeLists.txt +++ b/ExampleViewJS/CMakeLists.txt @@ -115,6 +115,11 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD --prefix ${ManiVault_INSTALL_DIR}/$ ) +# Append plugin version to output file +# 0 disables automatic folder placement (same as plugin type) +# since we want to place all example plugins in a separate folder +mv_handle_plugin_config(${PROJECT_NAME} 0) + # ----------------------------------------------------------------------------- # Miscellaneous # ----------------------------------------------------------------------------- diff --git a/ExampleViewOpenGL/CMakeLists.txt b/ExampleViewOpenGL/CMakeLists.txt index dbd662f..2ee2a67 100644 --- a/ExampleViewOpenGL/CMakeLists.txt +++ b/ExampleViewOpenGL/CMakeLists.txt @@ -112,6 +112,11 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD --prefix ${ManiVault_INSTALL_DIR}/$ ) +# Append plugin version to output file +# 0 disables automatic folder placement (same as plugin type) +# since we want to place all example plugins in a separate folder +mv_handle_plugin_config(${PROJECT_NAME} 0) + # ----------------------------------------------------------------------------- # Miscellaneous # ----------------------------------------------------------------------------- diff --git a/ExampleWriter/CMakeLists.txt b/ExampleWriter/CMakeLists.txt index 1ea323e..cf86087 100644 --- a/ExampleWriter/CMakeLists.txt +++ b/ExampleWriter/CMakeLists.txt @@ -96,6 +96,11 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD --prefix ${ManiVault_INSTALL_DIR}/$ ) +# Append plugin version to output file +# 0 disables automatic folder placement (same as plugin type) +# since we want to place all example plugins in a separate folder +mv_handle_plugin_config(${PROJECT_NAME} 0) + # ----------------------------------------------------------------------------- # Miscellaneous # ----------------------------------------------------------------------------- From 2d71e1081ff04647bd936a983ee4c22306a7327e Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Wed, 4 Jun 2025 17:22:27 +0200 Subject: [PATCH 3/3] Cleaner cmake setup: define languages and check MSVC more robustly --- ExampleAnalysis/CMakeLists.txt | 8 ++++---- ExampleAnalysis/PluginInfo.json | 6 +++++- ExampleData/CMakeLists.txt | 8 ++++---- ExampleData/PluginInfo.json | 6 +++++- ExampleDependencies/CMakeLists.txt | 12 ++++++------ ExampleDependencies/PluginInfo.json | 6 +++++- ExampleLoader/CMakeLists.txt | 8 ++++---- ExampleLoader/PluginInfo.json | 6 +++++- ExampleTransformation/CMakeLists.txt | 8 ++++---- ExampleTransformation/PluginInfo.json | 6 +++++- ExampleView/CMakeLists.txt | 8 ++++---- ExampleView/PluginInfo.json | 6 +++++- ExampleViewJS/CMakeLists.txt | 8 ++++---- ExampleViewJS/PluginInfo.json | 6 +++++- ExampleViewOpenGL/CMakeLists.txt | 8 ++++---- ExampleViewOpenGL/PluginInfo.json | 6 +++++- ExampleWriter/CMakeLists.txt | 8 ++++---- ExampleWriter/PluginInfo.json | 6 +++++- 18 files changed, 83 insertions(+), 47 deletions(-) diff --git a/ExampleAnalysis/CMakeLists.txt b/ExampleAnalysis/CMakeLists.txt index 54d945f..9f443a4 100644 --- a/ExampleAnalysis/CMakeLists.txt +++ b/ExampleAnalysis/CMakeLists.txt @@ -5,7 +5,7 @@ option(MV_UNITY_BUILD "Combine target source files into batches for faster compi # ----------------------------------------------------------------------------- # ExampleAnalysis Plugin # ----------------------------------------------------------------------------- -PROJECT("ExampleAnalysisPlugin") +PROJECT("ExampleAnalysisPlugin" LANGUAGES CXX) # ----------------------------------------------------------------------------- # CMake Options @@ -14,12 +14,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32 /EHsc /MP /permissive- /Zc:__cplusplus") 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 @@ -108,7 +108,7 @@ mv_handle_plugin_config(${PROJECT_NAME} 0) # Miscellaneous # ----------------------------------------------------------------------------- # Automatically set the debug environment (command + working directory) for MSVC -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${ManiVault_INSTALL_DIR}/Debug,$,${ManiVault_INSTALL_DIR}/RelWithDebInfo,${ManiVault_INSTALL_DIR}/Release>>) set_property(TARGET ${PROJECT_NAME} 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/ExampleAnalysis/PluginInfo.json b/ExampleAnalysis/PluginInfo.json index c86b9e0..8b0dce3 100644 --- a/ExampleAnalysis/PluginInfo.json +++ b/ExampleAnalysis/PluginInfo.json @@ -1,5 +1,9 @@ { "name" : "Example Analysis", - "version" : "1.4", + "version" : { + "plugin" : "1.4", + "core" : ["1.3"] + }, + "type" : "Analysis", "dependencies" : ["Points"] } diff --git a/ExampleData/CMakeLists.txt b/ExampleData/CMakeLists.txt index a428562..14eef19 100644 --- a/ExampleData/CMakeLists.txt +++ b/ExampleData/CMakeLists.txt @@ -5,7 +5,7 @@ option(MV_UNITY_BUILD "Combine target source files into batches for faster compi # ----------------------------------------------------------------------------- # ExampleData Plugin # ----------------------------------------------------------------------------- -PROJECT("ExampleDataPlugin") +PROJECT("ExampleDataPlugin" LANGUAGES CXX) # ----------------------------------------------------------------------------- # CMake Options and Setup @@ -14,12 +14,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32 /EHsc /MP /permissive- /Zc:__cplusplus") 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() # Include cmake tools include(GenerateExportHeader) @@ -129,7 +129,7 @@ mv_handle_plugin_config(${PROJECT_NAME} 0) # Miscellaneous # ----------------------------------------------------------------------------- # Automatically set the debug environment (command + working directory) for MSVC -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${ManiVault_INSTALL_DIR}/Debug,$,${ManiVault_INSTALL_DIR}/RelWithDebInfo,${ManiVault_INSTALL_DIR}/Release>>) set_property(TARGET ${PROJECT_NAME} 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/ExampleData/PluginInfo.json b/ExampleData/PluginInfo.json index 72ee74b..767e105 100644 --- a/ExampleData/PluginInfo.json +++ b/ExampleData/PluginInfo.json @@ -1,5 +1,9 @@ { "name" : "Example Data", - "version" : "1.4", + "version" : { + "plugin" : "1.4", + "core" : ["1.3"] + }, + "type" : "Data", "dependencies" : [] } diff --git a/ExampleDependencies/CMakeLists.txt b/ExampleDependencies/CMakeLists.txt index 94a3f33..bfb865c 100644 --- a/ExampleDependencies/CMakeLists.txt +++ b/ExampleDependencies/CMakeLists.txt @@ -5,7 +5,7 @@ option(MV_UNITY_BUILD "Combine target source files into batches for faster compi # ----------------------------------------------------------------------------- # ExampleAnalysis Plugin # ----------------------------------------------------------------------------- -PROJECT("ExampleDependenciesPlugin") +PROJECT("ExampleDependenciesPlugin" LANGUAGES CXX C) # ----------------------------------------------------------------------------- # CMake Options @@ -14,12 +14,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32 /EHsc /MP /permissive- /Zc:__cplusplus") 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() include(cmake/get_cpm.cmake) @@ -40,7 +40,7 @@ CPMAddPackage( OPTIONS "HWY_ENABLE_EXAMPLES OFF" "HWY_ENABLE_INSTALL OFF" "HWY_ENABLE_TESTS OFF" "HWY_ENABLE_CONTRIB ON" "BUILD_SHARED_LIBS ON" ) -if (MSVC) +if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set_target_properties(hwy_test PROPERTIES EXCLUDE_FROM_ALL True) set_target_properties(hwy_list_targets PROPERTIES EXCLUDE_FROM_ALL True) endif() @@ -68,7 +68,7 @@ set(PLUGIN_SOURCES src/ExampleDependenciesPlugin.cpp src/SettingsAction.h src/SettingsAction.cpp - src/ExampleDependenciesPlugin.json + PluginInfo.json ) source_group(Plugin FILES ${PLUGIN_SOURCES}) @@ -160,7 +160,7 @@ mv_handle_plugin_config(${PROJECT_NAME} 0) # Miscellaneous # ----------------------------------------------------------------------------- # Automatically set the debug environment (command + working directory) for MSVC -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${ManiVault_INSTALL_DIR}/Debug,$,${ManiVault_INSTALL_DIR}/RelWithDebInfo,${ManiVault_INSTALL_DIR}/Release>>) set_property(TARGET ${PROJECT_NAME} 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/ExampleDependencies/PluginInfo.json b/ExampleDependencies/PluginInfo.json index e89938b..6994b4e 100644 --- a/ExampleDependencies/PluginInfo.json +++ b/ExampleDependencies/PluginInfo.json @@ -1,5 +1,9 @@ { "name" : "Example Dependencies", - "version" : "1.4", + "version" : { + "plugin" : "1.4", + "core" : ["1.3"] + }, + "type" : "Analysis", "dependencies" : ["Points"] } diff --git a/ExampleLoader/CMakeLists.txt b/ExampleLoader/CMakeLists.txt index 8baa859..71a4837 100644 --- a/ExampleLoader/CMakeLists.txt +++ b/ExampleLoader/CMakeLists.txt @@ -5,7 +5,7 @@ option(MV_UNITY_BUILD "Combine target source files into batches for faster compi # ----------------------------------------------------------------------------- # ExampleLoader Plugin # ----------------------------------------------------------------------------- -PROJECT("ExampleLoaderPlugin") +PROJECT("ExampleLoaderPlugin" LANGUAGES CXX) # ----------------------------------------------------------------------------- # CMake Options @@ -14,12 +14,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32 /EHsc /MP /permissive- /Zc:__cplusplus") 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 @@ -105,7 +105,7 @@ mv_handle_plugin_config(${PROJECT_NAME} 0) # Miscellaneous # ----------------------------------------------------------------------------- # Automatically set the debug environment (command + working directory) for MSVC -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${ManiVault_INSTALL_DIR}/Debug,$,${ManiVault_INSTALL_DIR}/RelWithDebInfo,${ManiVault_INSTALL_DIR}/Release>>) set_property(TARGET ${PROJECT_NAME} 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/ExampleLoader/PluginInfo.json b/ExampleLoader/PluginInfo.json index 4050aa3..567fd12 100644 --- a/ExampleLoader/PluginInfo.json +++ b/ExampleLoader/PluginInfo.json @@ -1,6 +1,10 @@ { "name" : "Example Loader", "menuName" : "Example (.xmp)", - "version" : "1.4", + "version" : { + "plugin" : "1.4", + "core" : ["1.3"] + }, + "type" : "Loader", "dependencies" : ["Points"] } diff --git a/ExampleTransformation/CMakeLists.txt b/ExampleTransformation/CMakeLists.txt index 07c6375..1062e48 100644 --- a/ExampleTransformation/CMakeLists.txt +++ b/ExampleTransformation/CMakeLists.txt @@ -5,7 +5,7 @@ option(MV_UNITY_BUILD "Combine target source files into batches for faster compi # ----------------------------------------------------------------------------- # ExampleTransformation Plugin # ----------------------------------------------------------------------------- -PROJECT("ExampleTransformationPlugin") +PROJECT("ExampleTransformationPlugin" LANGUAGES CXX) # ----------------------------------------------------------------------------- # CMake Options @@ -14,12 +14,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32 /EHsc /MP /permissive- /Zc:__cplusplus") 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 @@ -105,7 +105,7 @@ mv_handle_plugin_config(${PROJECT_NAME} 0) # Miscellaneous # ----------------------------------------------------------------------------- # Automatically set the debug environment (command + working directory) for MSVC -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${ManiVault_INSTALL_DIR}/Debug,$,${ManiVault_INSTALL_DIR}/RelWithDebInfo,${ManiVault_INSTALL_DIR}/Release>>) set_property(TARGET ${PROJECT_NAME} 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/ExampleTransformation/PluginInfo.json b/ExampleTransformation/PluginInfo.json index 1017770..1832c81 100644 --- a/ExampleTransformation/PluginInfo.json +++ b/ExampleTransformation/PluginInfo.json @@ -1,5 +1,9 @@ { "name" : "Example Transformation", - "version" : "1.4", + "version" : { + "plugin" : "1.4", + "core" : ["1.3"] + }, + "type" : "Transformation", "dependencies" : ["Points"] } diff --git a/ExampleView/CMakeLists.txt b/ExampleView/CMakeLists.txt index de7cbf4..1a73e9c 100644 --- a/ExampleView/CMakeLists.txt +++ b/ExampleView/CMakeLists.txt @@ -5,7 +5,7 @@ option(MV_UNITY_BUILD "Combine target source files into batches for faster compi # ----------------------------------------------------------------------------- # ExampleView Plugin # ----------------------------------------------------------------------------- -PROJECT("ExampleViewPlugin") +PROJECT("ExampleViewPlugin" LANGUAGES CXX) # ----------------------------------------------------------------------------- # CMake Options @@ -14,12 +14,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32 /EHsc /MP /permissive- /Zc:__cplusplus") 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 @@ -109,7 +109,7 @@ mv_handle_plugin_config(${PROJECT_NAME} 0) # Miscellaneous # ----------------------------------------------------------------------------- # Automatically set the debug environment (command + working directory) for MSVC -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${ManiVault_INSTALL_DIR}/Debug,$,${ManiVault_INSTALL_DIR}/RelWithDebInfo,${ManiVault_INSTALL_DIR}/Release>>) set_property(TARGET ${PROJECT_NAME} 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/ExampleView/PluginInfo.json b/ExampleView/PluginInfo.json index 135c2df..063bb77 100644 --- a/ExampleView/PluginInfo.json +++ b/ExampleView/PluginInfo.json @@ -1,5 +1,9 @@ { "name" : "Example View", - "version" : "1.4", + "version" : { + "plugin" : "1.4", + "core" : ["1.3"] + }, + "type" : "Viewer", "dependencies" : ["Points"] } diff --git a/ExampleViewJS/CMakeLists.txt b/ExampleViewJS/CMakeLists.txt index ce56ba6..e2ce19b 100644 --- a/ExampleViewJS/CMakeLists.txt +++ b/ExampleViewJS/CMakeLists.txt @@ -5,7 +5,7 @@ option(MV_UNITY_BUILD "Combine target source files into batches for faster compi # ----------------------------------------------------------------------------- # ExampleViewJS Plugin # ----------------------------------------------------------------------------- -PROJECT("ExampleViewJSPlugin") +PROJECT("ExampleViewJSPlugin" LANGUAGES CXX) # ----------------------------------------------------------------------------- # CMake Options @@ -14,12 +14,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32 /EHsc /MP /permissive- /Zc:__cplusplus") 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 @@ -124,7 +124,7 @@ mv_handle_plugin_config(${PROJECT_NAME} 0) # Miscellaneous # ----------------------------------------------------------------------------- # Automatically set the debug environment (command + working directory) for MSVC -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${ManiVault_INSTALL_DIR}/Debug,$,${ManiVault_INSTALL_DIR}/RelWithDebInfo,${ManiVault_INSTALL_DIR}/Release>>) set_property(TARGET ${PROJECT_NAME} 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/ExampleViewJS/PluginInfo.json b/ExampleViewJS/PluginInfo.json index 5bc8779..399577c 100644 --- a/ExampleViewJS/PluginInfo.json +++ b/ExampleViewJS/PluginInfo.json @@ -1,5 +1,9 @@ { "name" : "Example View JS", - "version" : "1.4", + "version" : { + "plugin" : "1.4", + "core" : ["1.3"] + }, + "type" : "Viewer", "dependencies" : ["Points"] } diff --git a/ExampleViewOpenGL/CMakeLists.txt b/ExampleViewOpenGL/CMakeLists.txt index 2ee2a67..f6c5cca 100644 --- a/ExampleViewOpenGL/CMakeLists.txt +++ b/ExampleViewOpenGL/CMakeLists.txt @@ -5,7 +5,7 @@ option(MV_UNITY_BUILD "Combine target source files into batches for faster compi # ----------------------------------------------------------------------------- # ExampleViewOpenGL Plugin # ----------------------------------------------------------------------------- -PROJECT("ExampleViewOpenGLPlugin") +PROJECT("ExampleViewOpenGLPlugin" LANGUAGES CXX) # ----------------------------------------------------------------------------- # CMake Options @@ -14,12 +14,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32 /EHsc /MP /permissive- /Zc:__cplusplus") 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 @@ -121,7 +121,7 @@ mv_handle_plugin_config(${PROJECT_NAME} 0) # Miscellaneous # ----------------------------------------------------------------------------- # Automatically set the debug environment (command + working directory) for MSVC -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${ManiVault_INSTALL_DIR}/Debug,$,${ManiVault_INSTALL_DIR}/RelWithDebInfo,${ManiVault_INSTALL_DIR}/Release>>) set_property(TARGET ${PROJECT_NAME} 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/ExampleViewOpenGL/PluginInfo.json b/ExampleViewOpenGL/PluginInfo.json index daec2ed..0d243e7 100644 --- a/ExampleViewOpenGL/PluginInfo.json +++ b/ExampleViewOpenGL/PluginInfo.json @@ -1,5 +1,9 @@ { "name" : "Example View OpenGL", - "version" : "1.4", + "version" : { + "plugin" : "1.4", + "core" : ["1.3"] + }, + "type" : "Viewer", "dependencies" : ["Points"] } diff --git a/ExampleWriter/CMakeLists.txt b/ExampleWriter/CMakeLists.txt index cf86087..95b7275 100644 --- a/ExampleWriter/CMakeLists.txt +++ b/ExampleWriter/CMakeLists.txt @@ -5,7 +5,7 @@ option(MV_UNITY_BUILD "Combine target source files into batches for faster compi # ----------------------------------------------------------------------------- # ExampleWriter Plugin # ----------------------------------------------------------------------------- -PROJECT("ExampleWriterPlugin") +PROJECT("ExampleWriterPlugin" LANGUAGES CXX) # ----------------------------------------------------------------------------- # CMake Options @@ -14,12 +14,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32 /EHsc /MP /permissive- /Zc:__cplusplus") 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 @@ -105,7 +105,7 @@ mv_handle_plugin_config(${PROJECT_NAME} 0) # Miscellaneous # ----------------------------------------------------------------------------- # Automatically set the debug environment (command + working directory) for MSVC -if(MSVC) +if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${ManiVault_INSTALL_DIR}/Debug,$,${ManiVault_INSTALL_DIR}/RelWithDebInfo,${ManiVault_INSTALL_DIR}/Release>>) set_property(TARGET ${PROJECT_NAME} 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/ExampleWriter/PluginInfo.json b/ExampleWriter/PluginInfo.json index 636d962..00a4115 100644 --- a/ExampleWriter/PluginInfo.json +++ b/ExampleWriter/PluginInfo.json @@ -1,6 +1,10 @@ { "name" : "Example Writer", "menuName" : "Example (.xmp)", - "version" : "1.4", + "version" : { + "plugin" : "1.4", + "core" : ["1.3"] + }, + "type" : "Writer", "dependencies" : ["Points"] }