From d634883da88574e00518b7d8c57ae0807f2740d9 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Mon, 1 Mar 2021 18:30:10 +0100 Subject: [PATCH] first filters use add_meshlab_plugins_function --- src/meshlabplugins/filter_ao/CMakeLists.txt | 18 +---------------- .../filter_camera/CMakeLists.txt | 18 +---------------- .../filter_color_projection/CMakeLists.txt | 19 +----------------- .../filter_colorproc/CMakeLists.txt | 18 +---------------- .../filter_create/CMakeLists.txt | 18 +---------------- .../filter_createiso/CMakeLists.txt | 18 +---------------- src/meshlabplugins/filter_csg/CMakeLists.txt | 20 +------------------ src/meshlabplugins/filter_dirt/CMakeLists.txt | 18 +---------------- .../filter_fractal/CMakeLists.txt | 18 +---------------- src/meshlabplugins/filter_func/CMakeLists.txt | 18 +---------------- 10 files changed, 10 insertions(+), 173 deletions(-) diff --git a/src/meshlabplugins/filter_ao/CMakeLists.txt b/src/meshlabplugins/filter_ao/CMakeLists.txt index feb2938db..d7be9b6ea 100644 --- a/src/meshlabplugins/filter_ao/CMakeLists.txt +++ b/src/meshlabplugins/filter_ao/CMakeLists.txt @@ -8,22 +8,6 @@ set(HEADERS filter_ao.h) set(RESOURCES filter_ao.qrc) -add_library(filter_ao MODULE ${SOURCES} ${HEADERS} ${RESOURCES}) - -target_include_directories(filter_ao PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(filter_ao PUBLIC meshlab-common) +add_meshlab_plugin(filter_ao ${SOURCES} ${HEADERS} ${RESOURCES}) target_link_libraries(filter_ao PRIVATE OpenGL::GLU) - -set_property(TARGET filter_ao PROPERTY FOLDER Plugins) - -set_property(TARGET filter_ao PROPERTY RUNTIME_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - -set_property(TARGET filter_ao PROPERTY LIBRARY_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - -install( - TARGETS filter_ao - DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR} - COMPONENT Plugins) diff --git a/src/meshlabplugins/filter_camera/CMakeLists.txt b/src/meshlabplugins/filter_camera/CMakeLists.txt index 864b07a5b..a5530bfb4 100644 --- a/src/meshlabplugins/filter_camera/CMakeLists.txt +++ b/src/meshlabplugins/filter_camera/CMakeLists.txt @@ -6,20 +6,4 @@ set(SOURCES filter_camera.cpp) set(HEADERS filter_camera.h) -add_library(filter_camera MODULE ${SOURCES} ${HEADERS}) - -target_include_directories(filter_camera PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(filter_camera PUBLIC meshlab-common) - -set_property(TARGET filter_camera PROPERTY FOLDER Plugins) - -set_property(TARGET filter_camera PROPERTY RUNTIME_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - -set_property(TARGET filter_camera PROPERTY LIBRARY_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - -install( - TARGETS filter_camera - DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR} - COMPONENT Plugins) +add_meshlab_plugin(filter_camera ${SOURCES} ${HEADERS}) diff --git a/src/meshlabplugins/filter_color_projection/CMakeLists.txt b/src/meshlabplugins/filter_color_projection/CMakeLists.txt index 2dcad7276..5b6ae95a0 100644 --- a/src/meshlabplugins/filter_color_projection/CMakeLists.txt +++ b/src/meshlabplugins/filter_color_projection/CMakeLists.txt @@ -7,21 +7,4 @@ set(SOURCES filter_color_projection.cpp) set(HEADERS filter_color_projection.h floatbuffer.h pushpull.h rastering.h render_helper.h) -add_library(filter_color_projection MODULE ${SOURCES} ${HEADERS}) - -target_include_directories(filter_color_projection - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(filter_color_projection PUBLIC meshlab-common) - -set_property(TARGET filter_color_projection PROPERTY FOLDER Plugins) - -set_property(TARGET filter_color_projection - PROPERTY RUNTIME_OUTPUT_DIRECTORY ${MESHLAB_PLUGIN_OUTPUT_DIR}) - -set_property(TARGET filter_color_projection - PROPERTY LIBRARY_OUTPUT_DIRECTORY ${MESHLAB_PLUGIN_OUTPUT_DIR}) - -install( - TARGETS filter_color_projection - DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR} - COMPONENT Plugins) +add_meshlab_plugin(filter_color_projection ${SOURCES} ${HEADERS}) diff --git a/src/meshlabplugins/filter_colorproc/CMakeLists.txt b/src/meshlabplugins/filter_colorproc/CMakeLists.txt index 1fe148c99..bf6c34f64 100644 --- a/src/meshlabplugins/filter_colorproc/CMakeLists.txt +++ b/src/meshlabplugins/filter_colorproc/CMakeLists.txt @@ -6,20 +6,4 @@ set(SOURCES filter_colorproc.cpp) set(HEADERS filter_colorproc.h) -add_library(filter_colorproc MODULE ${SOURCES} ${HEADERS}) - -target_include_directories(filter_colorproc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(filter_colorproc PUBLIC meshlab-common) - -set_property(TARGET filter_colorproc PROPERTY FOLDER Plugins) - -set_property(TARGET filter_colorproc PROPERTY RUNTIME_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - -set_property(TARGET filter_colorproc PROPERTY LIBRARY_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - -install( - TARGETS filter_colorproc - DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR} - COMPONENT Plugins) +add_meshlab_plugin(filter_colorproc ${SOURCES} ${HEADERS}) diff --git a/src/meshlabplugins/filter_create/CMakeLists.txt b/src/meshlabplugins/filter_create/CMakeLists.txt index 150b77bc9..ce0cf385f 100644 --- a/src/meshlabplugins/filter_create/CMakeLists.txt +++ b/src/meshlabplugins/filter_create/CMakeLists.txt @@ -6,20 +6,4 @@ set(SOURCES filter_create.cpp) set(HEADERS filter_create.h) -add_library(filter_create MODULE ${SOURCES} ${HEADERS}) - -target_include_directories(filter_create PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(filter_create PUBLIC meshlab-common) - -set_property(TARGET filter_create PROPERTY FOLDER Plugins) - -set_property(TARGET filter_create PROPERTY RUNTIME_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - -set_property(TARGET filter_create PROPERTY LIBRARY_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - -install( - TARGETS filter_create - DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR} - COMPONENT Plugins) +add_meshlab_plugin(filter_create ${SOURCES} ${HEADERS}) diff --git a/src/meshlabplugins/filter_createiso/CMakeLists.txt b/src/meshlabplugins/filter_createiso/CMakeLists.txt index 2fc272369..9c3cc6738 100644 --- a/src/meshlabplugins/filter_createiso/CMakeLists.txt +++ b/src/meshlabplugins/filter_createiso/CMakeLists.txt @@ -6,20 +6,4 @@ set(SOURCES filter_createiso.cpp) set(HEADERS filter_createiso.h) -add_library(filter_createiso MODULE ${SOURCES} ${HEADERS}) - -target_include_directories(filter_createiso PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(filter_createiso PUBLIC meshlab-common) - -set_property(TARGET filter_createiso PROPERTY FOLDER Plugins) - -set_property(TARGET filter_createiso PROPERTY RUNTIME_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - -set_property(TARGET filter_createiso PROPERTY LIBRARY_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - -install( - TARGETS filter_createiso - DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR} - COMPONENT Plugins) +add_meshlab_plugin(filter_createiso ${SOURCES} ${HEADERS}) diff --git a/src/meshlabplugins/filter_csg/CMakeLists.txt b/src/meshlabplugins/filter_csg/CMakeLists.txt index aab4f226f..e7417877b 100644 --- a/src/meshlabplugins/filter_csg/CMakeLists.txt +++ b/src/meshlabplugins/filter_csg/CMakeLists.txt @@ -9,10 +9,7 @@ if(TARGET external-gmp OR TARGET external-mpir) set(HEADERS filter_csg.h gmpfrac.h intercept.h) - add_library(filter_csg MODULE ${SOURCES} ${HEADERS}) - - target_include_directories(filter_csg PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) - target_link_libraries(filter_csg PUBLIC meshlab-common) + add_meshlab_plugin(filter_csg ${SOURCES} ${HEADERS}) if(TARGET external-gmp) target_compile_definitions(filter_csg PRIVATE BUILD_WITH_GMP) @@ -21,21 +18,6 @@ if(TARGET external-gmp OR TARGET external-mpir) target_link_libraries(filter_csg PRIVATE external-mpir) endif() - set_property(TARGET filter_csg PROPERTY FOLDER Plugins) - - set_property( - TARGET filter_csg - PROPERTY RUNTIME_OUTPUT_DIRECTORY ${MESHLAB_PLUGIN_OUTPUT_DIR}) - - set_property( - TARGET filter_csg - PROPERTY LIBRARY_OUTPUT_DIRECTORY ${MESHLAB_PLUGIN_OUTPUT_DIR}) - - install( - TARGETS filter_csg - DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR} - COMPONENT Plugins) - else() message( STATUS "Skipping filter_csg - don't know about gmp or mpir on this system.") diff --git a/src/meshlabplugins/filter_dirt/CMakeLists.txt b/src/meshlabplugins/filter_dirt/CMakeLists.txt index 296ad9141..cdc4e561b 100644 --- a/src/meshlabplugins/filter_dirt/CMakeLists.txt +++ b/src/meshlabplugins/filter_dirt/CMakeLists.txt @@ -6,20 +6,4 @@ set(SOURCES dirt_utils.cpp filter_dirt.cpp) set(HEADERS dirt_utils.h dustparticle.h dustsampler.h filter_dirt.h particle.h) -add_library(filter_dirt MODULE ${SOURCES} ${HEADERS}) - -target_include_directories(filter_dirt PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(filter_dirt PUBLIC meshlab-common) - -set_property(TARGET filter_dirt PROPERTY FOLDER Plugins) - -set_property(TARGET filter_dirt PROPERTY RUNTIME_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - -set_property(TARGET filter_dirt PROPERTY LIBRARY_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - -install( - TARGETS filter_dirt - DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR} - COMPONENT Plugins) +add_meshlab_plugin(filter_dirt ${SOURCES} ${HEADERS}) diff --git a/src/meshlabplugins/filter_fractal/CMakeLists.txt b/src/meshlabplugins/filter_fractal/CMakeLists.txt index cc319b324..8584d69e9 100644 --- a/src/meshlabplugins/filter_fractal/CMakeLists.txt +++ b/src/meshlabplugins/filter_fractal/CMakeLists.txt @@ -6,20 +6,4 @@ set(SOURCES filter_fractal.cpp) set(HEADERS craters_utils.h filter_fractal.h filter_functors.h fractal_utils.h) -add_library(filter_fractal MODULE ${SOURCES} ${HEADERS}) - -target_include_directories(filter_fractal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(filter_fractal PUBLIC meshlab-common) - -set_property(TARGET filter_fractal PROPERTY FOLDER Plugins) - -set_property(TARGET filter_fractal PROPERTY RUNTIME_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - -set_property(TARGET filter_fractal PROPERTY LIBRARY_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - -install( - TARGETS filter_fractal - DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR} - COMPONENT Plugins) +add_meshlab_plugin(filter_fractal ${SOURCES} ${HEADERS}) diff --git a/src/meshlabplugins/filter_func/CMakeLists.txt b/src/meshlabplugins/filter_func/CMakeLists.txt index 61b993bb8..5cfa535d4 100644 --- a/src/meshlabplugins/filter_func/CMakeLists.txt +++ b/src/meshlabplugins/filter_func/CMakeLists.txt @@ -9,26 +9,10 @@ if(TARGET external-muparser) set(HEADERS filter_func.h filter_refine.h string_conversion.h) - add_library(filter_func MODULE ${SOURCES} ${HEADERS}) - - target_include_directories(filter_func PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) - target_link_libraries(filter_func PUBLIC meshlab-common) + add_meshlab_plugin(filter_func ${SOURCES} ${HEADERS}) target_link_libraries(filter_func PRIVATE external-muparser) - set_property(TARGET filter_func PROPERTY FOLDER Plugins) - - set_property(TARGET filter_func PROPERTY RUNTIME_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - - set_property(TARGET filter_func PROPERTY LIBRARY_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - - install( - TARGETS filter_func - DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR} - COMPONENT Plugins) - else() message(STATUS "Skipping filter_func - don't have muparser.") endif()