Просмотр исходного кода

Fix cmake version and memory include

Eric Ramat 3 лет назад
Родитель
Сommit
de354bd037
2 измененных файлов с 10 добавлено и 24 удалено
  1. 9 24
      CMakeLists.txt
  2. 1 0
      src/artis-star/common/utils/Multithreading.hpp

+ 9 - 24
CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.16)
 PROJECT(ARTIS_STAR CXX C)
 ENABLE_TESTING()
 
@@ -64,29 +64,14 @@ INCLUDE(CheckLibraryExists)
 INCLUDE(CMakeDetermineCCompiler)
 
 #
- # Test the libboost header and libboost-text library.
-#
-
-OPTION(WITH_TEST "use the libboost test unit library [default: on]" ON)
-SET(Boost_USE_MULTITHREADED ON)
-SET(Boost_USE_STATIC_LIBS OFF)
-SET(Boost_NO_SYSTEM_PATHS OFF)
-SET(Boost_USE_STATIC_RUNTIME ON)
-IF (WIN32)
-  SET(Boost_THREADAPI "win32")
-ENDIF (WIN32)
-SET(Boost_DETAILED_FAILURE_MSG FALSE)
-SET(Boost_DEBUG FALSE)
-
-FIND_PACKAGE(Boost COMPONENTS mpi timer serialization system)
-IF (Boost_MINOR_VERSION AND ${Boost_MINOR_VERSION} LESS "35")
-  SET(Boost_SYSTEM_LIBRARY "")
-ENDIF (Boost_MINOR_VERSION AND ${Boost_MINOR_VERSION} LESS "35")
-IF (Boost_MINOR_VERSION AND ${Boost_MINOR_VERSION} LESS "41")
-  SET(ARTIS_HAVE_BOOST_SPIRIT2 0 CACHE INTERNAL "" FORCE)
-ELSE (Boost_MINOR_VERSION AND ${Boost_MINOR_VERSION} LESS "41")
-  SET(ARTIS_HAVE_BOOST_SPIRIT2 1 CACHE INTERNAL "" FORCE)
-ENDIF (Boost_MINOR_VERSION AND ${Boost_MINOR_VERSION} LESS "41")
+ # Boost libraries
+#
+
+set( Boost_USE_STATIC_LIBS OFF )
+set( Boost_USE_MULTITHREADED ON )
+set( Boost_USE_STATIC_RUNTIME OFF )
+
+find_package( Boost 1.72.0 COMPONENTS mpi timer serialization system )
 
 #
  # Generate the config.h

+ 1 - 0
src/artis-star/common/utils/Multithreading.hpp

@@ -27,6 +27,7 @@
 #ifndef COMMON_UTILS_MULTITHREADING
 #define COMMON_UTILS_MULTITHREADING
 
+#include <memory>
 #include <queue>
 
 namespace artis {