Commit 709d4c1f authored by Elisa Rebolini's avatar Elisa Rebolini
Browse files

update CMakeLists.txt for cmake version and Globaldeps

parent a6950b05
Pipeline #9740 passed with stages
in 13 minutes and 43 seconds
......@@ -2,7 +2,7 @@
# Commad line arguments section
#################################
cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
# By default the built is in CONSOLE mode and 32 bits. If 64 bits have to be used one should do -D ARCH32=OFF
option(MINGW_HDF_TRICK "Help building with MinGW" OFF)
......@@ -122,4 +122,4 @@ if (PROG_EX)
if(USE_HDF)
add_subdirectory(Program_Examples/ReadNeXuS)
endif()
endif()
\ No newline at end of file
endif()
......@@ -2,7 +2,7 @@
# Commad line arguments section
#################################
cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
#################################
# Project section
......
......@@ -19,7 +19,6 @@ if(WIN32)
endif()
# MacOS
elseif(APPLE)
set(GLOBAL_DEPS CFML_GlobalDeps_MacOS.f90)
# Intel Fortran compiler
if(${COMPILER_NAME} STREQUAL ifort)
set(GLOBAL_DEPS CFML_GlobalDeps_MacOS_Intel.f90)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment