qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [1/7] qpid-proton git commit: NO-JIRA: default to universal binaries on Mac OS X
Date Tue, 28 Apr 2015 16:14:20 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/0.9.x 6839ac1ac -> 611cfa495


NO-JIRA: default to universal binaries on Mac OS X

The system-installed Perl, Python etc. are all built as universal
binaries on Mac and so we need to build libqpid-proton to similarly
contain both architectures. This allows the bindings to link
successfully.

(cherry picked from commit a509195b94eef52389d6880ada6d77e7ed7a1885)


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/893e834b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/893e834b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/893e834b

Branch: refs/heads/0.9.x
Commit: 893e834b9d140a439902be334d40ef62f1d4070c
Parents: 6839ac1
Author: Dominic Evans <dominic.evans@uk.ibm.com>
Authored: Mon Apr 27 15:41:55 2015 +0100
Committer: Dominic Evans <dominic.evans@uk.ibm.com>
Committed: Tue Apr 28 17:07:21 2015 +0100

----------------------------------------------------------------------
 CMakeLists.txt | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/893e834b/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b07c931..966d333 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,13 @@ if (MSVC)
 endif (MSVC)
 option(BUILD_WITH_CXX "Compile Proton using C++" ${DEFAULT_BUILD_WITH_CXX})
 
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  # Default to universal binary on Mac OS X unless user has overriden
+  if (NOT DEFINED CMAKE_OSX_ARCHITECTURES OR "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
+    set(CMAKE_OSX_ARCHITECTURES "i386;x86_64")
+  endif ()
+endif ()
+
 if (BUILD_WITH_CXX)
   project (Proton C CXX)
 endif (BUILD_WITH_CXX)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message