From 7d84c57c4fcf1c2c12caa17aa798568107f44beb Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 2 Nov 2022 17:03:24 +0100 Subject: [PATCH] fix e57 plugin --- .gitignore | 1 + src/external/e57.cmake | 1 + src/external/xerces.cmake | 4 +--- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 02bfedf7a..48f7134aa 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/src/external/e57.cmake b/src/external/e57.cmake index 99e3c5e60..61968cf4b 100644 --- a/src/external/e57.cmake +++ b/src/external/e57.cmake @@ -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.") diff --git a/src/external/xerces.cmake b/src/external/xerces.cmake index 620aa7631..59df3092a 100644 --- a/src/external/xerces.cmake +++ b/src/external/xerces.cmake @@ -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()