From 4bafb0ef2fae15cd988a6c38e39b145d0fb0a495 Mon Sep 17 00:00:00 2001 From: Philip Top Date: Mon, 23 Apr 2018 01:01:22 -0400 Subject: [PATCH] add definitions to not use experimental/any on mac platform (#276) * add definitions to not use experimental/any on mac platform * add compile def to core to not use experimental/any on mac builds --- src/helics/common/CMakeLists.txt | 4 ++++ src/helics/core/CMakeLists.txt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/helics/common/CMakeLists.txt b/src/helics/common/CMakeLists.txt index 460bb86699..1e4f16254f 100644 --- a/src/helics/common/CMakeLists.txt +++ b/src/helics/common/CMakeLists.txt @@ -89,5 +89,9 @@ if (HELICS_HAVE_ZEROMQ) target_include_directories (helics_common PRIVATE "${ZeroMQ_INCLUDE_DIR}") endif(HELICS_HAVE_ZEROMQ) +if (APPLE) + target_compile_definitions(helics_common PUBLIC "-DSTX_NO_STD_ANY=1") +endif(APPLE) + install(FILES ${helics_public_common} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/helics/common COMPONENT headers) diff --git a/src/helics/core/CMakeLists.txt b/src/helics/core/CMakeLists.txt index b851b9b80b..d73eedd397 100644 --- a/src/helics/core/CMakeLists.txt +++ b/src/helics/core/CMakeLists.txt @@ -174,6 +174,10 @@ IF (VERSION_OPTION) ENDIF (MSVC) ENDIF(VERSION_OPTION) +if (APPLE) + target_compile_definitions(helics_core PUBLIC "-DSTX_NO_STD_ANY=1") +endif(APPLE) + if (${MPI_C_FOUND}) source_group("mpi" FILES ${MPI_SOURCE_FILES} ${MPI_HEADER_FILES}) endif (${MPI_C_FOUND})