From c1930afccdfbd594947dcdf6a67e91a0282da4b0 Mon Sep 17 00:00:00 2001 From: Max Lohrmann Date: Mon, 22 May 2017 00:11:23 +0200 Subject: Because of a change in CMake the updated libmysqlclient was only runnable on 10.12+, while 10.6+ was intended (Also adapted the build script) --- .../MySQL Client Libraries/lib/libmysqlclient.a | Bin 7939096 -> 7932592 bytes Frameworks/SPMySQLFramework/build-mysql-client.sh | 10 ++++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Frameworks/SPMySQLFramework/MySQL Client Libraries/lib/libmysqlclient.a b/Frameworks/SPMySQLFramework/MySQL Client Libraries/lib/libmysqlclient.a index 8c6baea0..0fccae22 100644 Binary files a/Frameworks/SPMySQLFramework/MySQL Client Libraries/lib/libmysqlclient.a and b/Frameworks/SPMySQLFramework/MySQL Client Libraries/lib/libmysqlclient.a differ diff --git a/Frameworks/SPMySQLFramework/build-mysql-client.sh b/Frameworks/SPMySQLFramework/build-mysql-client.sh index 2e7c4fc9..5475b0a0 100755 --- a/Frameworks/SPMySQLFramework/build-mysql-client.sh +++ b/Frameworks/SPMySQLFramework/build-mysql-client.sh @@ -156,9 +156,15 @@ then exit 1 fi +# For CMake 3.0+ use CMAKE_OSX_SYSROOT and CMAKE_OSX_DEPLOYMENT_TARGET to set SDK path and minimum version +CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DCMAKE_OSX_SYSROOT='${SDK_PATH}' -DCMAKE_OSX_DEPLOYMENT_TARGET=${MIN_OS_X_VERSION}" + +# For CMake 2 add these parameters to the CFLAGS/CXXFLAGS: +# -isysroot ${SDK_PATH} -mmacosx-version-min=${MIN_OS_X_VERSION} + # C/C++ compiler flags -export CFLAGS="-isysroot ${SDK_PATH} ${ARCHITECTURES} -O3 -fno-omit-frame-pointer -fno-exceptions -mmacosx-version-min=${MIN_OS_X_VERSION}" -export CXXFLAGS="-isysroot ${SDK_PATH} ${ARCHITECTURES} -O3 -fno-omit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti -mmacosx-version-min=${MIN_OS_X_VERSION}" +export CFLAGS="${ARCHITECTURES} -O3 -fno-omit-frame-pointer -fno-exceptions" +export CXXFLAGS="${ARCHITECTURES} -O3 -fno-omit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti" echo "$ESC[1mConfiguring MySQL source...$ESC[0m" -- cgit v1.2.3