diff options
| author | tamasmeszaros <meszaros.q@gmail.com> | 2019-12-10 14:50:52 +0300 |
|---|---|---|
| committer | tamasmeszaros <meszaros.q@gmail.com> | 2019-12-10 14:50:52 +0300 |
| commit | f94321e117243ddd468f927181e81a0997db84c2 (patch) | |
| tree | 7351c0afb4fd283cabbb04b7ea5e9513da38be72 /deps | |
| parent | 2cc45dbf2169c34e86c569497bf682ff2647ade0 (diff) | |
Add Unix builds for gmp and mpfr, downloading and configure for cgal
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/CGAL/CGAL.cmake | 5 | ||||
| -rw-r--r-- | deps/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | deps/GMP/GMP.cmake | 8 | ||||
| -rw-r--r-- | deps/MPFR/MPFR.cmake | 9 |
4 files changed, 27 insertions, 1 deletions
diff --git a/deps/CGAL/CGAL.cmake b/deps/CGAL/CGAL.cmake index 802635d09..4b127cd51 100644 --- a/deps/CGAL/CGAL.cmake +++ b/deps/CGAL/CGAL.cmake @@ -1,6 +1,9 @@ prusaslicer_add_cmake_project( CGAL GIT_REPOSITORY https://github.com/CGAL/cgal.git - GIT_TAG "releases/CGAL-5.0" + GIT_TAG bec70a6d52d8aacb0b3d82a7b4edc3caa899184b # releases/CGAL-5.0 + # For whatever reason, this keeps downloading forever (repeats downloads if finished) + # URL https://github.com/CGAL/cgal/archive/releases/CGAL-5.0.zip + # URL_HASH SHA256=bd9327be903ab7ee379a8a7a0609eba0962f5078d2497cf8e13e8e1598584154 DEPENDS dep_boost dep_GMP dep_MPFR )
\ No newline at end of file diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index e23c5f908..1e3e26a25 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -62,10 +62,12 @@ function(prusaslicer_add_cmake_project projectname) CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}/usr/local + -DCMAKE_DEBUG_POSTFIX:STRING=d -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER} -DBUILD_SHARED_LIBS:BOOL=OFF ${_configs_line} + ${DEP_CMAKE_OPTS} ${P_ARGS_CMAKE_ARGS} ${P_ARGS_UNPARSED_ARGUMENTS} ) @@ -111,6 +113,10 @@ else() include("deps-linux.cmake") endif() +include(GMP/GMP.cmake) +include(MPFR/MPFR.cmake) +include(CGAL/CGAL.cmake) + if (MSVC) add_custom_target(deps ALL diff --git a/deps/GMP/GMP.cmake b/deps/GMP/GMP.cmake index 5c6dbe4aa..9874dcf8d 100644 --- a/deps/GMP/GMP.cmake +++ b/deps/GMP/GMP.cmake @@ -16,4 +16,12 @@ if (MSVC) add_custom_target(dep_GMP SOURCES ${_output}) +else () + ExternalProject_Add(dep_GMP + URL https://gmplib.org/download/gmp/gmp-6.1.2.tar.bz2 + BUILD_IN_SOURCE ON + CONFIGURE_COMMAND ./configure --enable-shared=no --enable-static=yes "--prefix=${DESTDIR}/usr/local" --with-pic + BUILD_COMMAND make -j + INSTALL_COMMAND make install + ) endif ()
\ No newline at end of file diff --git a/deps/MPFR/MPFR.cmake b/deps/MPFR/MPFR.cmake index b57b1c0f9..f89488dcf 100644 --- a/deps/MPFR/MPFR.cmake +++ b/deps/MPFR/MPFR.cmake @@ -17,4 +17,13 @@ if (MSVC) add_custom_target(dep_MPFR SOURCES ${_output}) +else () + ExternalProject_Add(dep_MPFR + URL https://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.bz2 + BUILD_IN_SOURCE ON + CONFIGURE_COMMAND ./configure --prefix=${DESTDIR}/usr/local --with-gmp=${DESTDIR}/usr/local --with-pic + BUILD_COMMAND make -j + INSTALL_COMMAND make install + DEPENDS dep_GMP + ) endif ()
\ No newline at end of file |