PROTON-522: Apache Qpid Proton on Mac/OSX

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

Branch: refs/heads/master
Commit: e9480cb3cd46e3f1437a0b03462cdf2bcd52bb25
Parents: 6dddff2
Author: Andrew Stitcher <astitc...@apache.org>
Authored: Fri Nov 10 12:53:14 2017 -0500
Committer: Andrew Stitcher <astitc...@apache.org>
Committed: Thu Nov 23 03:50:41 2017 -0500

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


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e9480cb3/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b1e7a5..48e1d5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,9 +82,10 @@ if (CMAKE_BUILD_TYPE MATCHES "Coverage")
 endif()
 
 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")
+  if (NOT CMAKE_OSX_ARCHITECTURES)
+    set(CMAKE_OSX_ARCHITECTURES "x86_64")
+    set(LIB_SUFFIX "")
+    set(CMAKE_MACOSX_RPATH ON)
   endif ()
 endif ()
 


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

Reply via email to