diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 32254f5e6..800a1933f 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -29,6 +29,7 @@ set(SOURCES set(HEADERS GLExtensionsManager.h GLLogStream.h + alnParser.h filterparameter.h filterscript.h interfaces.h @@ -57,6 +58,7 @@ target_link_libraries( common PUBLIC Qt5::Core Qt5::OpenGL + Qt5::Script Qt5::Widgets Qt5::Xml Qt5::XmlPatterns diff --git a/src/meshlab/CMakeLists.txt b/src/meshlab/CMakeLists.txt index accb1be3a..20f996e50 100644 --- a/src/meshlab/CMakeLists.txt +++ b/src/meshlab/CMakeLists.txt @@ -31,7 +31,6 @@ set(SOURCES set(HEADERS additionalgui.h - alnParser.h changetexturename.h customDialog.h filterScriptDialog.h diff --git a/src/meshlabplugins/edit_align/CMakeLists.txt b/src/meshlabplugins/edit_align/CMakeLists.txt index a5e30c4a1..d2e4e5625 100644 --- a/src/meshlabplugins/edit_align/CMakeLists.txt +++ b/src/meshlabplugins/edit_align/CMakeLists.txt @@ -11,6 +11,7 @@ if(TARGET external-newuoa) set(SOURCES align/align_parameter.cpp align/AlignGlobal.cpp + align/AlignPair.cpp align/OccupancyGrid.cpp alignDialog.cpp AlignPairDialog.cpp @@ -26,6 +27,7 @@ if(TARGET external-newuoa) set(HEADERS align/align_parameter.h align/AlignGlobal.h + align/AlignPair.h align/OccupancyGrid.h alignDialog.h AlignPairDialog.h diff --git a/src/meshlabplugins/edit_pickpoints/CMakeLists.txt b/src/meshlabplugins/edit_pickpoints/CMakeLists.txt index cf77c4cd7..966318cf2 100644 --- a/src/meshlabplugins/edit_pickpoints/CMakeLists.txt +++ b/src/meshlabplugins/edit_pickpoints/CMakeLists.txt @@ -2,8 +2,7 @@ # SPDX-License-Identifier: BSL-1.0 ### Generated file! Edit the templates in src/templates, -### specifically src/templates/CMakeLists.template.cmake (shared with all other directories), -### or create a derived template in src/templates/edit_pickpoints.cmake, +### specifically src/templates/edit_pickpoints.cmake (custom for this directory), ### then re-run ./make-cmake.py set(SOURCES diff --git a/src/meshlabplugins/filter_isoparametrization/CMakeLists.txt b/src/meshlabplugins/filter_isoparametrization/CMakeLists.txt index 0eb090ab4..b97aed5d2 100644 --- a/src/meshlabplugins/filter_isoparametrization/CMakeLists.txt +++ b/src/meshlabplugins/filter_isoparametrization/CMakeLists.txt @@ -5,8 +5,8 @@ ### specifically src/templates/filter_isoparametrization.cmake (custom for this directory), ### then re-run ./make-cmake.py -# Only build if we have levmar -if(TARGET external-levmar) +# Only build if we have newuoa and levmar +if(TARGET external-newuoa AND TARGET external-levmar) set(SOURCES filter_isoparametrization.cpp) @@ -64,6 +64,6 @@ if(TARGET external-levmar) else() message( STATUS - "Skipping filter_isoparametrization - missing levmar in external directory." + "Skipping filter_isoparametrization - missing either newuoa or levmar in external directory." ) endif() diff --git a/src/meshlabplugins/filter_mutualinfo/CMakeLists.txt b/src/meshlabplugins/filter_mutualinfo/CMakeLists.txt index 17c906c77..acdee749b 100644 --- a/src/meshlabplugins/filter_mutualinfo/CMakeLists.txt +++ b/src/meshlabplugins/filter_mutualinfo/CMakeLists.txt @@ -35,15 +35,15 @@ if(TARGET external-newuoa AND TARGET external-levmar) target_link_libraries(filter_mutualinfo PUBLIC common) target_link_libraries(filter_mutualinfo PRIVATE external-newuoa - external-levmar) + external-levmar) set_property(TARGET filter_mutualinfo PROPERTY FOLDER Plugins) - set_property(TARGET filter_mutualinfo - PROPERTY RUNTIME_OUTPUT_DIRECTORY ${MESHLAB_PLUGIN_OUTPUT_DIR}) + set_property(TARGET filter_mutualinfo PROPERTY RUNTIME_OUTPUT_DIRECTORY + ${MESHLAB_PLUGIN_OUTPUT_DIR}) - set_property(TARGET filter_mutualinfo - PROPERTY LIBRARY_OUTPUT_DIRECTORY ${MESHLAB_PLUGIN_OUTPUT_DIR}) + set_property(TARGET filter_mutualinfo PROPERTY LIBRARY_OUTPUT_DIRECTORY + ${MESHLAB_PLUGIN_OUTPUT_DIR}) install( TARGETS filter_mutualinfo diff --git a/src/meshlabplugins/filter_sketchfab/CMakeLists.txt b/src/meshlabplugins/filter_sketchfab/CMakeLists.txt index a7d916311..b7aec2ccd 100644 --- a/src/meshlabplugins/filter_sketchfab/CMakeLists.txt +++ b/src/meshlabplugins/filter_sketchfab/CMakeLists.txt @@ -5,8 +5,6 @@ ### specifically src/templates/filter_sketchfab.cmake (custom for this directory), ### then re-run ./make-cmake.py -find_package(Qt5 COMPONENTS Qml REQUIRED) - set(SOURCES filter_sketchfab.cpp ${VCGDIR}/wrap/ply/plylib.cpp) set(HEADERS filter_sketchfab.h miniz.h) @@ -14,7 +12,7 @@ set(HEADERS filter_sketchfab.h miniz.h) add_library(filter_sketchfab MODULE ${SOURCES} ${HEADERS}) target_include_directories(filter_sketchfab PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(filter_sketchfab PUBLIC Qt5::Qml common) +target_link_libraries(filter_sketchfab PUBLIC common) set_property(TARGET filter_sketchfab PROPERTY FOLDER Plugins) diff --git a/src/meshlabplugins/filter_voronoi/CMakeLists.txt b/src/meshlabplugins/filter_voronoi/CMakeLists.txt index 1f01efa8a..10a9451d6 100644 --- a/src/meshlabplugins/filter_voronoi/CMakeLists.txt +++ b/src/meshlabplugins/filter_voronoi/CMakeLists.txt @@ -18,10 +18,10 @@ target_link_libraries(filter_voronoi PUBLIC common) set_property(TARGET filter_voronoi PROPERTY FOLDER Plugins) set_property(TARGET filter_voronoi PROPERTY RUNTIME_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) + ${MESHLAB_PLUGIN_OUTPUT_DIR}) set_property(TARGET filter_voronoi PROPERTY LIBRARY_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) + ${MESHLAB_PLUGIN_OUTPUT_DIR}) install( TARGETS filter_voronoi diff --git a/src/meshlabplugins/io_u3d/CMakeLists.txt b/src/meshlabplugins/io_u3d/CMakeLists.txt index 2cbd9fe0f..be9434bee 100644 --- a/src/meshlabplugins/io_u3d/CMakeLists.txt +++ b/src/meshlabplugins/io_u3d/CMakeLists.txt @@ -6,33 +6,24 @@ ### or create a derived template in src/templates/io_u3d.cmake, ### then re-run ./make-cmake.py -# Only build if we have u3d -if(TARGET external-IDTFConverter) +set(SOURCES io_u3d.cpp) - set(SOURCES io_u3d.cpp) +set(HEADERS io_u3d.h) - set(HEADERS io_u3d.h) +add_library(io_u3d MODULE ${SOURCES} ${HEADERS}) - add_library(io_u3d MODULE ${SOURCES} ${HEADERS}) +target_include_directories(io_u3d PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(io_u3d PUBLIC common) - target_include_directories(io_u3d PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) - target_link_libraries(io_u3d PUBLIC common) +set_property(TARGET io_u3d PROPERTY FOLDER Plugins) - target_link_libraries(io_u3d PRIVATE external-IDTFConverter ${CMAKE_DL_LIBS}) +set_property(TARGET io_u3d PROPERTY RUNTIME_OUTPUT_DIRECTORY + ${MESHLAB_PLUGIN_OUTPUT_DIR}) - set_property(TARGET io_u3d PROPERTY FOLDER Plugins) +set_property(TARGET io_u3d PROPERTY LIBRARY_OUTPUT_DIRECTORY + ${MESHLAB_PLUGIN_OUTPUT_DIR}) - set_property(TARGET io_u3d PROPERTY RUNTIME_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - - set_property(TARGET io_u3d PROPERTY LIBRARY_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) - - install( - TARGETS io_u3d - DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR} - COMPONENT Plugins) - -else() - message(STATUS "Skipping io_u3d - missing u3d") -endif() +install( + TARGETS io_u3d + DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR} + COMPONENT Plugins) diff --git a/src/plugins_unsupported/filter_measure_xml/CMakeLists.txt b/src/plugins_unsupported/filter_measure_xml/CMakeLists.txt index 1359ddc8b..457dcc2e3 100644 --- a/src/plugins_unsupported/filter_measure_xml/CMakeLists.txt +++ b/src/plugins_unsupported/filter_measure_xml/CMakeLists.txt @@ -3,29 +3,26 @@ ### Generated file! Edit the templates in src/templates, ### specifically src/templates/CMakeLists.template.cmake (shared with all other directories), -### or create a derived template in src/templates/filter_measure.cmake, +### or create a derived template in src/templates/filter_measure_xml.cmake, ### then re-run ./make-cmake.py set(SOURCES filter_measure_xml.cpp) set(HEADERS filter_measure_xml.h) -set(XML filter_measure_xml.xml) -meshlab_install_plugin_xml(${CMAKE_CURRENT_SOURCE_DIR}/${XML} XML_OUT) -list(APPEND SOURCES ${XML_OUT}) - add_library(filter_measure_xml MODULE ${SOURCES} ${HEADERS}) -target_include_directories(filter_measure_xml PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(filter_measure_xml + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(filter_measure_xml PUBLIC common) set_property(TARGET filter_measure_xml PROPERTY FOLDER Plugins) set_property(TARGET filter_measure_xml PROPERTY RUNTIME_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) + ${MESHLAB_PLUGIN_OUTPUT_DIR}) set_property(TARGET filter_measure_xml PROPERTY LIBRARY_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) + ${MESHLAB_PLUGIN_OUTPUT_DIR}) install( TARGETS filter_measure_xml diff --git a/src/plugins_unsupported/filter_mutualinfo_xml/CMakeLists.txt b/src/plugins_unsupported/filter_mutualinfo_xml/CMakeLists.txt index f1fdcd49d..da38aef38 100644 --- a/src/plugins_unsupported/filter_mutualinfo_xml/CMakeLists.txt +++ b/src/plugins_unsupported/filter_mutualinfo_xml/CMakeLists.txt @@ -2,61 +2,45 @@ # SPDX-License-Identifier: BSL-1.0 ### Generated file! Edit the templates in src/templates, -### specifically src/templates/filter_mutualinfo_xml.cmake (custom for this directory), +### specifically src/templates/CMakeLists.template.cmake (shared with all other directories), +### or create a derived template in src/templates/filter_mutualinfo_xml.cmake, ### then re-run ./make-cmake.py -# Only build if we have newuoa and levmar -if(TARGET external-newuoa AND TARGET external-levmar) +set(SOURCES + alignset.cpp + filter_mutualinfo_xml.cpp + levmarmethods.cpp + mutual.cpp + parameters.cpp + pointCorrespondence.cpp + solver.cpp) - set(SOURCES - alignset.cpp - filter_mutualinfo_xml.cpp - levmarmethods.cpp - mutual.cpp - parameters.cpp - pointCorrespondence.cpp - solver.cpp) +set(HEADERS + alignset.h + filter_mutualinfo_xml.h + levmarmethods.h + mutual.h + parameters.h + pointCorrespondence.h + pointOnLayer.h + shutils.h + solver.h) - set(HEADERS - alignset.h - filter_mutualinfo_xml.h - levmarmethods.h - mutual.h - parameters.h - pointCorrespondence.h - pointOnLayer.h - shutils.h - solver.h) +add_library(filter_mutualinfo_xml MODULE ${SOURCES} ${HEADERS}) - set(XML filter_mutualinfo_xml.xml) - meshlab_install_plugin_xml(${CMAKE_CURRENT_SOURCE_DIR}/${XML} XML_OUT) - list(APPEND SOURCES ${XML_OUT}) +target_include_directories(filter_mutualinfo_xml + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(filter_mutualinfo_xml PUBLIC common) - add_library(filter_mutualinfo_xml MODULE ${SOURCES} ${HEADERS}) +set_property(TARGET filter_mutualinfo_xml PROPERTY FOLDER Plugins) - target_include_directories(filter_mutualinfo_xml - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) - target_link_libraries(filter_mutualinfo_xml PUBLIC common) - - target_link_libraries(filter_mutualinfo_xml PRIVATE external-newuoa - external-levmar) - - set_property(TARGET filter_mutualinfo_xml PROPERTY FOLDER Plugins) - - set_property(TARGET filter_mutualinfo_xml PROPERTY RUNTIME_OUTPUT_DIRECTORY +set_property(TARGET filter_mutualinfo_xml PROPERTY RUNTIME_OUTPUT_DIRECTORY ${MESHLAB_PLUGIN_OUTPUT_DIR}) - set_property(TARGET filter_mutualinfo_xml PROPERTY LIBRARY_OUTPUT_DIRECTORY +set_property(TARGET filter_mutualinfo_xml PROPERTY LIBRARY_OUTPUT_DIRECTORY ${MESHLAB_PLUGIN_OUTPUT_DIR}) - install( - TARGETS filter_mutualinfo_xml - DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR} - COMPONENT Plugins) - -else() - message( - STATUS - "Skipping filter_mutualinfo_xml - missing either newuoa or levmar in external directory." - ) -endif() +install( + TARGETS filter_mutualinfo_xml + DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR} + COMPONENT Plugins) diff --git a/src/plugins_unsupported/filter_screened_poisson_xml/CMakeLists.txt b/src/plugins_unsupported/filter_screened_poisson_xml/CMakeLists.txt index 251cb04a3..e74482bd6 100644 --- a/src/plugins_unsupported/filter_screened_poisson_xml/CMakeLists.txt +++ b/src/plugins_unsupported/filter_screened_poisson_xml/CMakeLists.txt @@ -2,13 +2,20 @@ # SPDX-License-Identifier: BSL-1.0 ### Generated file! Edit the templates in src/templates, -### specifically src/templates/filter_screened_poisson_xml.cmake (custom for this directory), +### specifically src/templates/CMakeLists.template.cmake (shared with all other directories), +### or create a derived template in src/templates/filter_screened_poisson_xml.cmake, ### then re-run ./make-cmake.py set(SOURCES - filter_screened_poisson.cpp Src/MarchingCubes.cpp - # Src/CmdLineParser.cpp - Src/Factor.cpp Src/Geometry.cpp) + Src/CmdLineParser.cpp + Src/Factor.cpp + Src/Geometry.cpp + Src/MarchingCubes.cpp + Src/PoissonRecon.cpp + Src/SSDRecon.cpp + Src/SurfaceTrimmer.cpp + Src/Time.cpp + filter_screened_poisson.cpp) set(HEADERS Src/Allocator.h @@ -35,32 +42,21 @@ set(HEADERS Src/Vector.h filter_screened_poisson.h) -set(XML filter_screened_poisson.xml) -meshlab_install_plugin_xml(${CMAKE_CURRENT_SOURCE_DIR}/${XML} XML_OUT) -list(APPEND SOURCES ${XML_OUT}) +add_library(filter_screened_poisson_xml MODULE ${SOURCES} ${HEADERS}) -add_library(filter_screened_poisson MODULE ${SOURCES} ${HEADERS}) - -target_compile_definitions(filter_screened_poisson PRIVATE BRUNO_LEVY_FIX - FOR_RELEASE) - -if(OpenMP_CXX_FOUND) - target_link_libraries(filter_screened_poisson PRIVATE OpenMP::OpenMP_CXX) -endif() - -target_include_directories(filter_screened_poisson +target_include_directories(filter_screened_poisson_xml PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(filter_screened_poisson PUBLIC common) +target_link_libraries(filter_screened_poisson_xml PUBLIC common) -set_property(TARGET filter_screened_poisson PROPERTY FOLDER Plugins) +set_property(TARGET filter_screened_poisson_xml PROPERTY FOLDER Plugins) -set_property(TARGET filter_screened_poisson +set_property(TARGET filter_screened_poisson_xml PROPERTY RUNTIME_OUTPUT_DIRECTORY ${MESHLAB_PLUGIN_OUTPUT_DIR}) -set_property(TARGET filter_screened_poisson +set_property(TARGET filter_screened_poisson_xml PROPERTY LIBRARY_OUTPUT_DIRECTORY ${MESHLAB_PLUGIN_OUTPUT_DIR}) install( - TARGETS filter_screened_poisson + TARGETS filter_screened_poisson_xml DESTINATION ${MESHLAB_PLUGIN_INSTALL_DIR} COMPONENT Plugins) diff --git a/src/plugins_unsupported/filter_sketchfab_xml/CMakeLists.txt b/src/plugins_unsupported/filter_sketchfab_xml/CMakeLists.txt index d98d16017..350b36765 100644 --- a/src/plugins_unsupported/filter_sketchfab_xml/CMakeLists.txt +++ b/src/plugins_unsupported/filter_sketchfab_xml/CMakeLists.txt @@ -2,29 +2,27 @@ # SPDX-License-Identifier: BSL-1.0 ### Generated file! Edit the templates in src/templates, -### specifically src/templates/filter_sketchfab_xml.cmake (custom for this directory), +### specifically src/templates/CMakeLists.template.cmake (shared with all other directories), +### or create a derived template in src/templates/filter_sketchfab_xml.cmake, ### then re-run ./make-cmake.py -set(SOURCES filter_sketchfab_xml.cpp ${VCGDIR}/wrap/ply/plylib.cpp) +set(SOURCES filter_sketchfab_xml.cpp) set(HEADERS filter_sketchfab_xml.h) -set(XML filter_sketchfab_xml.xml) -meshlab_install_plugin_xml(${CMAKE_CURRENT_SOURCE_DIR}/${XML} XML_OUT) -list(APPEND SOURCES ${XML_OUT}) - add_library(filter_sketchfab_xml MODULE ${SOURCES} ${HEADERS}) -target_include_directories(filter_sketchfab_xml PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(filter_sketchfab_xml + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(filter_sketchfab_xml PUBLIC common) set_property(TARGET filter_sketchfab_xml PROPERTY FOLDER Plugins) set_property(TARGET filter_sketchfab_xml PROPERTY RUNTIME_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) + ${MESHLAB_PLUGIN_OUTPUT_DIR}) set_property(TARGET filter_sketchfab_xml PROPERTY LIBRARY_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) + ${MESHLAB_PLUGIN_OUTPUT_DIR}) install( TARGETS filter_sketchfab_xml diff --git a/src/plugins_unsupported/filter_voronoi_xml/CMakeLists.txt b/src/plugins_unsupported/filter_voronoi_xml/CMakeLists.txt index 967bde4e5..dc673767d 100644 --- a/src/plugins_unsupported/filter_voronoi_xml/CMakeLists.txt +++ b/src/plugins_unsupported/filter_voronoi_xml/CMakeLists.txt @@ -3,29 +3,26 @@ ### Generated file! Edit the templates in src/templates, ### specifically src/templates/CMakeLists.template.cmake (shared with all other directories), -### or create a derived template in src/templates/filter_voronoi.cmake, +### or create a derived template in src/templates/filter_voronoi_xml.cmake, ### then re-run ./make-cmake.py set(SOURCES filter_voronoi_xml.cpp) set(HEADERS filter_voronoi_xml.h) -set(XML filter_voronoi_xml.xml) -meshlab_install_plugin_xml(${CMAKE_CURRENT_SOURCE_DIR}/${XML} XML_OUT) -list(APPEND SOURCES ${XML_OUT}) - add_library(filter_voronoi_xml MODULE ${SOURCES} ${HEADERS}) -target_include_directories(filter_voronoi_xml PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(filter_voronoi_xml + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(filter_voronoi_xml PUBLIC common) set_property(TARGET filter_voronoi_xml PROPERTY FOLDER Plugins) set_property(TARGET filter_voronoi_xml PROPERTY RUNTIME_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) + ${MESHLAB_PLUGIN_OUTPUT_DIR}) set_property(TARGET filter_voronoi_xml PROPERTY LIBRARY_OUTPUT_DIRECTORY - ${MESHLAB_PLUGIN_OUTPUT_DIR}) + ${MESHLAB_PLUGIN_OUTPUT_DIR}) install( TARGETS filter_voronoi_xml diff --git a/src/plugins_unsupported/sample_xmlfilter/CMakeLists.txt b/src/plugins_unsupported/sample_xmlfilter/CMakeLists.txt index 8b1e6a320..59d128e55 100644 --- a/src/plugins_unsupported/sample_xmlfilter/CMakeLists.txt +++ b/src/plugins_unsupported/sample_xmlfilter/CMakeLists.txt @@ -10,10 +10,6 @@ set(SOURCES sample_xmlfilter.cpp) set(HEADERS sample_xmlfilter.h) -set(XML sample_xmlfilter.xml) -meshlab_install_plugin_xml(${CMAKE_CURRENT_SOURCE_DIR}/${XML} XML_OUT) -list(APPEND SOURCES ${XML_OUT}) - add_library(sample_xmlfilter MODULE ${SOURCES} ${HEADERS}) target_include_directories(sample_xmlfilter PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})