From cbec8185e6de30e7adf99dfaeec117395f4a7414 Mon Sep 17 00:00:00 2001 From: Phenom Date: Tue, 25 Jul 2017 18:08:37 +0200 Subject: [PATCH] Add qmake CONFIG flag for MacOS version. No need to change retroshare.pri, only add rs_macos10.x to qmake commande line. --- retroshare.pri | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/retroshare.pri b/retroshare.pri index 50f79bd59..30cf32a36 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -81,6 +81,13 @@ CONFIG *= rs_gxs_trans CONFIG *= no_rs_async_chat rs_async_chat:CONFIG -= no_rs_async_chat +# To select your MacOsX version append the following assignation to qmake +# command line "CONFIG+=rs_macos10.11" where 10.11(default for Travis_CI) depends your version +CONFIG *= rs_macos10.11 +rs_macos10.8:CONFIG -= rs_macos10.11 +rs_macos10.9:CONFIG -= rs_macos10.11 +rs_macos10.10:CONFIG -= rs_macos10.11 +rs_macos10.12:CONFIG -= rs_macos10.11 unix { @@ -156,6 +163,36 @@ win32 { } } +rs_macos10.8 { + message(***retroshare.pri: Set Target and SDK to MacOS 10.8 ) + QMAKE_MACOSX_DEPLOYMENT_TARGET=10.8 + QMAKE_MAC_SDK = macosx10.8 +} + +rs_macos10.9 { + message(***retroshare.pri: Set Target and SDK to MacOS 10.9 ) + QMAKE_MACOSX_DEPLOYMENT_TARGET=10.9 + QMAKE_MAC_SDK = macosx10.9 +} + +rs_macos10.10 { + message(***retroshare.pri: Set Target and SDK to MacOS 10.10 ) + QMAKE_MACOSX_DEPLOYMENT_TARGET=10.10 + QMAKE_MAC_SDK = macosx10.10 +} + +rs_macos10.11 { + message(***retroshare.pri: Set Target and SDK to MacOS 10.11 ) + QMAKE_MACOSX_DEPLOYMENT_TARGET=10.11 + QMAKE_MAC_SDK = macosx10.11 +} + +rs_macos10.12 { + message(***retroshare.pri: Set Target and SDK to MacOS 10.12 ) + QMAKE_MACOSX_DEPLOYMENT_TARGET=10.12 + QMAKE_MAC_SDK = macosx10.12 +} + macx { message(***retroshare.pri:MacOSX) BIN_DIR += "/usr/bin" @@ -164,15 +201,7 @@ macx { INC_DIR += "/opt/local/include" LIB_DIR += "/usr/local/lib" LIB_DIR += "/opt/local/lib" - !QMAKE_MACOSX_DEPLOYMENT_TARGET { - message(***retroshare.pri: No Target. Set it to MacOS 10.11 ) - QMAKE_MACOSX_DEPLOYMENT_TARGET=10.11 - } - !QMAKE_MAC_SDK { - message(***retroshare.pri: No SDK. Set it to MacOS 10.11 ) - QMAKE_MAC_SDK = macosx10.11 - } - CONFIG += c++11 + CONFIG += c++11 } unfinished {