Re-enable PickPoints in the CMake build.

Just needed some undefined references solved, actually.
This commit is contained in:
Ryan Pavlik 2020-05-06 17:08:56 -05:00
parent 2e69c640c8
commit 232e98899b
3 changed files with 13 additions and 5 deletions

View File

@ -251,7 +251,7 @@ else()
meshlabplugins/edit_measure
meshlabplugins/edit_mutualcorrs
meshlabplugins/edit_paint
# meshlabplugins/edit_pickpoints # not in qmake file?
meshlabplugins/edit_pickpoints
meshlabplugins/edit_point
meshlabplugins/edit_referencing
meshlabplugins/edit_quality

View File

@ -2,12 +2,12 @@
# 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 edit_pickpoints_factory.cpp editpickpoints.cpp
pickPointsTemplate.cpp pickedPoints.cpp pickpointsDialog.cpp)
set(SOURCES
edit_pickpoints_factory.cpp editpickpoints.cpp pickPointsTemplate.cpp
pickedPoints.cpp pickpointsDialog.cpp ../../meshlab/stdpardialog.cpp)
set(HEADERS edit_pickpoints_factory.h editpickpoints.h pickPointsTemplate.h
pickedPoints.h pickpointsDialog.h)
@ -21,6 +21,8 @@ add_library(edit_pickpoints MODULE ${SOURCES} ${HEADERS} ${RESOURCES} ${UI})
target_include_directories(edit_pickpoints PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(edit_pickpoints PUBLIC common)
target_link_libraries(edit_pickpoints PRIVATE OpenGL::GLU)
set_property(TARGET edit_pickpoints PROPERTY FOLDER Plugins)
set_property(TARGET edit_pickpoints PROPERTY RUNTIME_OUTPUT_DIRECTORY

View File

@ -0,0 +1,6 @@
{% extends "plugin_with_glu.cmake" %}
# Needed because GenericParamDialog is in meshlab, not common.
{% block sources %}
{{ super() }}
../../meshlab/stdpardialog.cpp
{% endblock %}