From e1ecf03e0c4637cc3f816b87fd557fc6c5d0b47e Mon Sep 17 00:00:00 2001
From: tamasmeszaros <meszaros.q@gmail.com>
Date: Mon, 16 Mar 2020 15:02:37 +0100
Subject: [PATCH] Revert "Fix minimum osx version not being specified for GMP
 and MPFR"

CXXFLAGS overrides default flags for gmp and mpfr
---
 deps/CMakeLists.txt   | 4 ----
 deps/GMP/GMP.cmake    | 4 ++--
 deps/MPFR/MPFR.cmake  | 2 +-
 deps/deps-macos.cmake | 3 ---
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index 1a98afad83..3935e38c3d 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -49,10 +49,6 @@ find_package(Git REQUIRED)
 
 get_property(_is_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 
-# C and CXX flags handed over to unix autotools projects.
-set(DEP_CFLAGS "")
-set(DEP_CXXFLAGS "")
-
 function(prusaslicer_add_cmake_project projectname)
     cmake_parse_arguments(P_ARGS "" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND" "CMAKE_ARGS" ${ARGN})
 
diff --git a/deps/GMP/GMP.cmake b/deps/GMP/GMP.cmake
index aa23a24e99..4e8228cbac 100644
--- a/deps/GMP/GMP.cmake
+++ b/deps/GMP/GMP.cmake
@@ -21,8 +21,8 @@ else ()
         # URL  https://gmplib.org/download/gmp/gmp-6.1.2.tar.bz2
         URL https://gmplib.org/download/gmp/gmp-6.2.0.tar.lz
         BUILD_IN_SOURCE ON 
-        CONFIGURE_COMMAND env "CFLAGS=${DEP_CFLAGS}" "CXXFLAGS=${DEP_CXXFLAGS}" ./configure --enable-shared=no --enable-cxx=yes --enable-static=yes "--prefix=${DESTDIR}/usr/local" --with-pic
+        CONFIGURE_COMMAND ./configure --enable-shared=no --enable-cxx=yes --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 89073fb73b..cda7eeea93 100644
--- a/deps/MPFR/MPFR.cmake
+++ b/deps/MPFR/MPFR.cmake
@@ -21,7 +21,7 @@ else ()
     ExternalProject_Add(dep_MPFR
         URL http://ftp.vim.org/ftp/gnu/mpfr/mpfr-3.1.6.tar.bz2 https://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.bz2  # mirrors are allowed
         BUILD_IN_SOURCE ON
-        CONFIGURE_COMMAND env "CFLAGS=${DEP_CFLAGS}" "CXXFLAGS=${DEP_CXXFLAGS}" ./configure --prefix=${DESTDIR}/usr/local --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local --with-pic
+        CONFIGURE_COMMAND ./configure --prefix=${DESTDIR}/usr/local --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local --with-pic
         BUILD_COMMAND make -j
         INSTALL_COMMAND make install
         DEPENDS dep_GMP
diff --git a/deps/deps-macos.cmake b/deps/deps-macos.cmake
index fbf2d6c480..17300b247e 100644
--- a/deps/deps-macos.cmake
+++ b/deps/deps-macos.cmake
@@ -11,9 +11,6 @@ set(DEP_CMAKE_OPTS
     "-DCMAKE_C_FLAGS=${DEP_WERRORS_SDK}"
 )
 
-list(APPEND DEP_CFLAGS "-mmacosx-version-min=${DEP_OSX_TARGET} ${DEP_WERRORS_SDK}")
-list(APPEND DEP_CXXFLAGS "-mmacosx-version-min=${DEP_OSX_TARGET} ${DEP_WERRORS_SDK}")
-
 include("deps-unix-common.cmake")