diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dca91da26..246cb50be 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -73,9 +73,19 @@ endif() ### Enter subdirectories # VCGLib -- required -if(NOT VCGDIR) +if (VCGDIR) # VCGDIR exists - using custom user vcglib path + if(EXISTS ${VCGDIR}) + add_subdirectory(${VCGDIR} {CMAKE_CURRENT_BINARY_DIR}/vcglib) + message(STATUS "- VCGLib - using custom VCGDIR path library") + else() + set(VCGDIR NOTFOUND) + endif() +else() get_filename_component(VCGDIR "${CMAKE_CURRENT_LIST_DIR}/vcglib" ABSOLUTE) - if(NOT EXISTS ${VCGDIR}) + if(EXISTS ${VCGDIR}) + add_subdirectory(${VCGDIR}) + message(STATUS "- VCGLib - using using bundled source") + else() set(VCGDIR NOTFOUND) endif() endif() diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 7254ec488..76ae187da 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -122,8 +122,6 @@ target_include_directories(meshlab-common PRIVATE ${EXTERNAL_DIR}/easyexif/ PUBLIC - ${VCGDIR} - ${EIGEN_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/..) target_link_libraries( @@ -134,6 +132,7 @@ target_link_libraries( Qt5::Widgets Qt5::Xml Qt5::Network + vcglib external-glew ) diff --git a/src/external/eigen.cmake b/src/external/eigen.cmake deleted file mode 100644 index 19d653801..000000000 --- a/src/external/eigen.cmake +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2019, 2020, Collabora, Ltd. -# Copyright 2019, 2020, Visual Computing Lab, ISTI - Italian National Research Council -# SPDX-License-Identifier: BSL-1.0 - -option(ALLOW_BUNDLED_EIGEN "Allow use of bundled Eigen source" ON) -option(ALLOW_SYSTEM_EIGEN "Allow use of system-provided Eigen" ON) - -set(EIGEN_DIR ${VCGDIR}/eigenlib) - -if(ALLOW_SYSTEM_EIGEN AND EIGEN3_INCLUDE_DIR) - message(STATUS "- Eigen - using system-provided library") - set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR}) -elseif(ALLOW_BUNDLED_EIGEN AND EXISTS "${EIGEN_DIR}/Eigen/Eigen") - message(STATUS "- Eigen - using bundled source") - set(EIGEN_INCLUDE_DIRS ${EIGEN_DIR}) -else() - message( - FATAL_ERROR - "Eigen is required - at least one of ALLOW_SYSTEM_EIGEN or ALLOW_BUNDLED_EIGEN must be enabled and found.") -endif() diff --git a/src/external/external_common.cmake b/src/external/external_common.cmake index bb5cb0eb0..eae693393 100644 --- a/src/external/external_common.cmake +++ b/src/external/external_common.cmake @@ -12,8 +12,5 @@ if(BUILD_BUNDLED_SOURCES_WITHOUT_WARNINGS) endif() endif() -# Eigen3 - required -include(${EXTERNAL_DIR}/eigen.cmake) - # GLEW - required include(${EXTERNAL_DIR}/glew.cmake) diff --git a/src/vcglib b/src/vcglib index ea276afef..7efd90dc0 160000 --- a/src/vcglib +++ b/src/vcglib @@ -1 +1 @@ -Subproject commit ea276afef7233f4ae32af2cc0b30074853c98b23 +Subproject commit 7efd90dc06e29b4a6066f29b4d3f168ae6c68e12