lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-17 01:54:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

using vcglib with cmake config

Browse Source
This commit is contained in:
alemuntoni 2021-03-24 12:26:06 +01:00
parent af805651f2
commit 44febc836f
5 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/CMakeLists.txt
View File

@ -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()

3
src/common/CMakeLists.txt
View File

@ -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
)

20
src/external/eigen.cmake vendored
View File

@ -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()

3
src/external/external_common.cmake vendored
View File

@ -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)

2
src/vcglib

@ -1 +1 @@
Subproject commit ea276afef7233f4ae32af2cc0b30074853c98b23
Subproject commit 7efd90dc06e29b4a6066f29b4d3f168ae6c68e12