lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-13 00:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main-alemuntoni' into muparser

Browse Source
This commit is contained in:
alemuntoni 2022-11-03 11:25:49 +01:00
commit 6658dbb8e9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -24,6 +24,7 @@ install/*
# external libraries automatically downloaded by cmake
src/external/downloads/*
src/external/tmp.zip
# files created/modified during deploy stage
install/macos/resources/meshlab_dmg_final.json

1
src/external/e57.cmake vendored
View File

@ -21,6 +21,7 @@ if (TARGET XercesC::XercesC)
add_library(external-libE57 INTERFACE)
target_link_libraries(external-libE57 INTERFACE E57Format)
install(TARGETS E57Format DESTINATION ${MESHLAB_LIB_INSTALL_DIR})
endif()
else()
message(STATUS - "Cannot build e57 because Xerces dependence not satisfied.")

4
src/external/xerces.cmake vendored
View File

@ -10,11 +10,9 @@ find_package(XercesC)
# https://dlcdn.apache.org//xerces/c/3/sources/xerces-c-3.2.4.zip
if(MESHLAB_ALLOW_SYSTEM_XERCES AND TARGET XercesC::XercesC)
message(STATUS "- XercesC - using system-provided library")
add_library(external-xerces INTERFACE)
target_link_libraries(external-xerces INTERFACE XercesC::XercesC)
elseif(MESHLAB_ALLOW_DOWNLOAD_SOURCE_XERCES)
set(XERCES_C_VER 3.2.4)
set(XERCES_C_DIR ${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/xerces-c-${XERCES_C_VER})
@ -37,5 +35,5 @@ elseif(MESHLAB_ALLOW_DOWNLOAD_SOURCE_XERCES)
${XERCES_C_DIR}/src
${MESHLAB_EXTERNAL_BINARY_DIR}/xerces-c-${XERCES_C_VER}/src)
add_library(XercesC::XercesC ALIAS external-xerces)
install(TARGETS xerces-c DESTINATION ${MESHLAB_LIB_INSTALL_DIR})
endif()