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
15 changes: 10 additions & 5 deletions ExampleAnalysis/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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})
Expand Down Expand Up @@ -99,11 +99,16 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
--prefix ${ManiVault_INSTALL_DIR}/$<CONFIGURATION>
)

# 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
# -----------------------------------------------------------------------------
# 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 $<IF:$<CONFIG:DEBUG>,${ManiVault_INSTALL_DIR}/Debug,$<IF:$<CONFIG:RELWITHDEBINFO>,${ManiVault_INSTALL_DIR}/RelWithDebInfo,${ManiVault_INSTALL_DIR}/Release>>)
set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_COMMAND $<IF:$<CONFIG:DEBUG>,"${ManiVault_INSTALL_DIR}/Debug/ManiVault Studio.exe",$<IF:$<CONFIG:RELWITHDEBINFO>,"${ManiVault_INSTALL_DIR}/RelWithDebInfo/ManiVault Studio.exe","${ManiVault_INSTALL_DIR}/Release/ManiVault Studio.exe">>)
endif()
9 changes: 9 additions & 0 deletions ExampleAnalysis/PluginInfo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name" : "Example Analysis",
"version" : {
"plugin" : "1.4",
"core" : ["1.3"]
},
"type" : "Analysis",
"dependencies" : ["Points"]
}
2 changes: 1 addition & 1 deletion ExampleAnalysis/src/ExampleAnalysisPlugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
5 changes: 0 additions & 5 deletions ExampleAnalysis/src/ExampleAnalysisPlugin.json

This file was deleted.

15 changes: 10 additions & 5 deletions ExampleData/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -120,11 +120,16 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
--prefix ${ManiVault_INSTALL_DIR}/$<CONFIGURATION>
)

# 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
# -----------------------------------------------------------------------------
# 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 $<IF:$<CONFIG:DEBUG>,${ManiVault_INSTALL_DIR}/Debug,$<IF:$<CONFIG:RELWITHDEBINFO>,${ManiVault_INSTALL_DIR}/RelWithDebInfo,${ManiVault_INSTALL_DIR}/Release>>)
set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_COMMAND $<IF:$<CONFIG:DEBUG>,"${ManiVault_INSTALL_DIR}/Debug/ManiVault Studio.exe",$<IF:$<CONFIG:RELWITHDEBINFO>,"${ManiVault_INSTALL_DIR}/RelWithDebInfo/ManiVault Studio.exe","${ManiVault_INSTALL_DIR}/Release/ManiVault Studio.exe">>)
endif()
9 changes: 9 additions & 0 deletions ExampleData/PluginInfo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name" : "Example Data",
"version" : {
"plugin" : "1.4",
"core" : ["1.3"]
},
"type" : "Data",
"dependencies" : []
}
2 changes: 1 addition & 1 deletion ExampleData/src/ExampleDataPlugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
5 changes: 0 additions & 5 deletions ExampleData/src/ExampleDataPlugin.json

This file was deleted.

17 changes: 11 additions & 6 deletions ExampleDependencies/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

Expand All @@ -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()
Expand Down Expand Up @@ -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})
Expand Down Expand Up @@ -151,11 +151,16 @@ 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
# -----------------------------------------------------------------------------
# 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 $<IF:$<CONFIG:DEBUG>,${ManiVault_INSTALL_DIR}/Debug,$<IF:$<CONFIG:RELWITHDEBINFO>,${ManiVault_INSTALL_DIR}/RelWithDebInfo,${ManiVault_INSTALL_DIR}/Release>>)
set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_COMMAND $<IF:$<CONFIG:DEBUG>,"${ManiVault_INSTALL_DIR}/Debug/ManiVault Studio.exe",$<IF:$<CONFIG:RELWITHDEBINFO>,"${ManiVault_INSTALL_DIR}/RelWithDebInfo/ManiVault Studio.exe","${ManiVault_INSTALL_DIR}/Release/ManiVault Studio.exe">>)
endif()
9 changes: 9 additions & 0 deletions ExampleDependencies/PluginInfo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name" : "Example Dependencies",
"version" : {
"plugin" : "1.4",
"core" : ["1.3"]
},
"type" : "Analysis",
"dependencies" : ["Points"]
}
2 changes: 1 addition & 1 deletion ExampleDependencies/src/ExampleDependenciesPlugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
5 changes: 0 additions & 5 deletions ExampleDependencies/src/ExampleDependenciesPlugin.json

This file was deleted.

15 changes: 10 additions & 5 deletions ExampleLoader/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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})
Expand Down Expand Up @@ -96,11 +96,16 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
--prefix ${ManiVault_INSTALL_DIR}/$<CONFIGURATION>
)

# 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
# -----------------------------------------------------------------------------
# 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 $<IF:$<CONFIG:DEBUG>,${ManiVault_INSTALL_DIR}/Debug,$<IF:$<CONFIG:RELWITHDEBINFO>,${ManiVault_INSTALL_DIR}/RelWithDebInfo,${ManiVault_INSTALL_DIR}/Release>>)
set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_COMMAND $<IF:$<CONFIG:DEBUG>,"${ManiVault_INSTALL_DIR}/Debug/ManiVault Studio.exe",$<IF:$<CONFIG:RELWITHDEBINFO>,"${ManiVault_INSTALL_DIR}/RelWithDebInfo/ManiVault Studio.exe","${ManiVault_INSTALL_DIR}/Release/ManiVault Studio.exe">>)
endif()
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"name" : "Example Loader",
"menuName" : "Example (.xmp)",
"version" : "1.4",
"version" : {
"plugin" : "1.4",
"core" : ["1.3"]
},
"type" : "Loader",
"dependencies" : ["Points"]
}
2 changes: 1 addition & 1 deletion ExampleLoader/src/ExampleLoaderPlugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
15 changes: 10 additions & 5 deletions ExampleTransformation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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})
Expand Down Expand Up @@ -96,11 +96,16 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
--prefix ${ManiVault_INSTALL_DIR}/$<CONFIGURATION>
)

# 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
# -----------------------------------------------------------------------------
# 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 $<IF:$<CONFIG:DEBUG>,${ManiVault_INSTALL_DIR}/Debug,$<IF:$<CONFIG:RELWITHDEBINFO>,${ManiVault_INSTALL_DIR}/RelWithDebInfo,${ManiVault_INSTALL_DIR}/Release>>)
set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DEBUGGER_COMMAND $<IF:$<CONFIG:DEBUG>,"${ManiVault_INSTALL_DIR}/Debug/ManiVault Studio.exe",$<IF:$<CONFIG:RELWITHDEBINFO>,"${ManiVault_INSTALL_DIR}/RelWithDebInfo/ManiVault Studio.exe","${ManiVault_INSTALL_DIR}/Release/ManiVault Studio.exe">>)
endif()
9 changes: 9 additions & 0 deletions ExampleTransformation/PluginInfo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name" : "Example Transformation",
"version" : {
"plugin" : "1.4",
"core" : ["1.3"]
},
"type" : "Transformation",
"dependencies" : ["Points"]
}
2 changes: 1 addition & 1 deletion ExampleTransformation/src/ExampleTransformationPlugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
5 changes: 0 additions & 5 deletions ExampleTransformation/src/ExampleTransformationPlugin.json

This file was deleted.

Loading