aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Lohrmann <dmoagx@users.noreply.github.com>2017-05-22 00:11:23 +0200
committerMax Lohrmann <dmoagx@users.noreply.github.com>2017-05-22 00:11:23 +0200
commitc1930afccdfbd594947dcdf6a67e91a0282da4b0 (patch)
tree11668932c3ef340063aa3e37e8d0afbe750628f1
parent67649f01d870037722aaee437c38a6da12c3b215 (diff)
downloadsequelpro-c1930afccdfbd594947dcdf6a67e91a0282da4b0.tar.gz
sequelpro-c1930afccdfbd594947dcdf6a67e91a0282da4b0.tar.bz2
sequelpro-c1930afccdfbd594947dcdf6a67e91a0282da4b0.zip
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)
-rw-r--r--Frameworks/SPMySQLFramework/MySQL Client Libraries/lib/libmysqlclient.abin7939096 -> 7932592 bytes
-rwxr-xr-xFrameworks/SPMySQLFramework/build-mysql-client.sh10
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
--- a/Frameworks/SPMySQLFramework/MySQL Client Libraries/lib/libmysqlclient.a
+++ b/Frameworks/SPMySQLFramework/MySQL Client Libraries/lib/libmysqlclient.a
Binary files 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"