This is an automated email from the ASF dual-hosted git repository.
astitcher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/main by this push:
new 019558c PROTON-2354: Fix some macOSX test failures
019558c is described below
commit 019558c13514f7757e3812a594effd65881c3554
Author: Andrew Stitcher <[email protected]>
AuthorDate: Fri Mar 26 17:24:31 2021 -0400
PROTON-2354: Fix some macOSX test failures
Also tidy up macOSX options a little.
---
CMakeLists.txt | 17 +++++++----------
cpp/CMakeLists.txt | 1 -
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5586a7..6d70a22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,9 +146,14 @@ endif()
# MacOS has a bunch of differences in build tools and process and so we have
to turn some things
# off if building there:
-if (APPLE)
+if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set (NOENABLE_WARNING_ERROR ON)
-endif (APPLE)
+ set (NOENABLE_HIDE_UNEXPORTED_SYMBOLS ON)
+ set (LIB_SUFFIX "")
+ if (POLICY CMP0042)
+ cmake_policy (SET CMP0042 NEW)
+ endif ()
+endif ()
# Benchmarks should be disabled by default
set (NOENABLE_BENCHMARKS ON)
@@ -235,14 +240,6 @@ if (MSVC)
set(CMAKE_DEBUG_POSTFIX "d")
endif (MSVC)
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- if (NOT CMAKE_OSX_ARCHITECTURES)
- set(CMAKE_OSX_ARCHITECTURES "x86_64")
- set(LIB_SUFFIX "")
- set(CMAKE_MACOSX_RPATH ON)
- endif ()
-endif ()
-
file(READ VERSION.txt PN_VERSION_FILE)
string(STRIP ${PN_VERSION_FILE} PN_VERSION_LINE)
string(REPLACE "-" ";" PN_VERSION_SPLIT "${PN_VERSION_LINE}")
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index ae9e923..93b409e 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -16,7 +16,6 @@
# specific language governing permissions and limitations
# under the License.
#
-cmake_minimum_required(VERSION 2.8.12)
include(CMakeDependentOption)
enable_language(CXX)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
