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
GMLC-TDC · Apr 23, 2018 · 4bafb0e · 4bafb0e
1 parent 7a97e99
commit 4bafb0e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git 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
@@ -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})