Disabling Vojtech's boost::polygon Voronoi GMP hack on 32bit platforms.

This commit is contained in:
bubnikv 2020-06-27 07:37:37 +02:00
parent f9a28d1561
commit 2e795b38c4

69
deps/CMakeLists.txt vendored
View File

@ -170,50 +170,37 @@ if (NOT "${ZLIB_PKG}" STREQUAL "")
add_dependencies(dep_openexr ${ZLIB_PKG}) add_dependencies(dep_openexr ${ZLIB_PKG})
endif () endif ()
set(_dep_list
dep_boost
dep_tbb
dep_libcurl
dep_wxWidgets
dep_gtest
dep_cereal
dep_nlopt
dep_openvdb
dep_OpenCSG
dep_CGAL
${PNG_PKG}
${ZLIB_PKG}
${EXPAT_PKG}
)
if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
# Only override boost::Polygon Voronoi implementation with Vojtech's GMP hacks on 64bit platforms.
list(APPEND _dep_list "dep_boost_polygon")
endif ()
if (MSVC) if (MSVC)
# Experimental
add_custom_target(deps ALL #list(APPEND _dep_list "dep_qhull")
DEPENDS
dep_boost
dep_boost_polygon
dep_tbb
dep_libcurl
dep_wxWidgets
dep_gtest
dep_cereal
dep_nlopt
# dep_qhull # Experimental
dep_openvdb
dep_OpenCSG
dep_CGAL
${PNG_PKG}
${ZLIB_PKG}
${EXPAT_PKG}
)
else() else()
list(APPEND _dep_list "dep_qhull")
add_custom_target(deps ALL # Not working, static build has different Eigen
DEPENDS #list(APPEND _dep_list "dep_libigl")
dep_boost
dep_boost_polygon
dep_tbb
dep_libcurl
dep_wxWidgets
dep_gtest
dep_cereal
dep_nlopt
dep_qhull
dep_openvdb
dep_OpenCSG
dep_CGAL
${PNG_PKG}
${ZLIB_PKG}
${EXPAT_PKG}
# dep_libigl # Not working, static build has different Eigen
)
endif() endif()
add_custom_target(deps ALL DEPENDS ${_dep_list})
# Note: I'm not using any of the LOG_xxx options in ExternalProject_Add() commands # Note: I'm not using any of the LOG_xxx options in ExternalProject_Add() commands
# because they seem to generate bogus build files (possibly a bug in ExternalProject). # because they seem to generate bogus build files (possibly a bug in ExternalProject).