Back to forcing no_auto_ptr on macos

NREL · Oct 24, 2020 · 654c1a0 · 654c1a0 · nrel-bot-2b · Oct 24, 2020
1 parent 1dbf364
commit 654c1a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/cmake/CompilerFlags.cmake b/cmake/CompilerFlags.cmake
@@ -12,6 +12,13 @@ ADD_DEFINITIONS("-DXML_STATIC")
 
 SET(CMAKE_CXX_STANDARD 17)
 
+if ( APPLE )
+  # Force no auto ptr
+  # TODO remove this after kiva/boost is updated to a version that supports
+  # C++17
+  ADD_DEFINITIONS("-DBOOST_NO_AUTO_PTR")
+endif()
+
 IF ( MSVC AND NOT ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" ) ) # Visual C++ (VS 2013)
 
     # COMPILER FLAGS

diff --git a/third_party/kiva-ep/CMakeLists.txt b/third_party/kiva-ep/CMakeLists.txt
@@ -24,8 +24,6 @@ set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${kiva_BINARY_DIR}" )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${kiva_BINARY_DIR}" )
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${kiva_BINARY_DIR}" )
 
-SET(CMAKE_CXX_STANDARD 17)
-
 if (KIVA_EXE_BUILD)
   set(CompilerFlags
           CMAKE_CXX_FLAGS