Update CMake templates to match

This commit is contained in:
Ryan Pavlik 2020-05-06 10:07:21 -05:00
parent e3e011b61d
commit ea08044c9b
6 changed files with 31 additions and 5 deletions

View File

@ -1,4 +1,11 @@
{% extends "CMakeLists.template.cmake" %}
{% block before_vars %}
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../ML_VERSION")
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/../../ML_VERSION" MESHLAB_VERSION)
add_definitions(-DMESHLAB_VERSION=${MESHLAB_VERSION})
endif()
{% endblock %}
{% block outputdir %}{%endblock%}
{% block add_target %}
set(TARGET_TYPE SHARED)

View File

@ -1,2 +1 @@
{% set name = "filter_mutualinfo" %}
{% extends "plugin_with_levmar.cmake" %}

View File

@ -0,0 +1,20 @@
{% set name = "filter_screened_poisson" %}
{% extends "CMakeLists.template.cmake" %}
{# subset of the sources #}
{% block sources %}
filter_screened_poisson.cpp
Src/MarchingCubes.cpp
# Src/CmdLineParser.cpp
Src/Factor.cpp
Src/Geometry.cpp
{% endblock %}
{% block linking %}
target_compile_definitions({{name}} PRIVATE BRUNO_LEVY_FIX FOR_RELEASE)
if(OpenMP_CXX_FOUND)
target_link_libraries({{name}} PRIVATE OpenMP::OpenMP_CXX)
endif()
{{ super() }}
{% endblock %}

View File

@ -16,10 +16,10 @@
{% block add_target %}
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
if(APPLE)
list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
images/meshlab.icns)
endif()
#if(APPLE)
# list(APPEND SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../install/macx/info.plist
# images/meshlab.icns)
#endif()
if(WIN32)
list(APPEND SOURCES meshlab.rc)