File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1414set (CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR} /install" CACHE PATH "CMake install prefix" )
1515
1616cmake_policy (SET CMP0048 NEW )
17- project (Serialbox LANGUAGES C CXX VERSION 2.5.0 )
17+ project (Serialbox LANGUAGES C CXX VERSION 2.5.1 )
1818cmake_minimum_required (VERSION 3.9.0 )
1919
2020set (CMAKE_CXX_EXTENSIONS OFF )
@@ -183,7 +183,10 @@ include(IDESupport)
183183
184184#---------------------------------------- GTest ----------------------------------------------------
185185if (SERIALBOX_TESTING)
186+ set (tmp_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS} )
187+ set (BUILD_SHARED_LIBS OFF )
186188 add_subdirectory (external/googletest )
189+ set (BUILD_SHARED_LIBS ${tmp_BUILD_SHARED_LIBS} )
187190
188191 if (SERIALBOX_ENABLE_C)
189192 set (SERIALBOX_HAS_C 1)
Original file line number Diff line number Diff line change @@ -95,6 +95,7 @@ elif [ "$FC_COMPILER" = "pgfortran18.10" ]; then
9595 FC_COMPILER=" pgfortran"
9696else
9797 module swap PrgEnv-cray PrgEnv-gnu
98+ module swap gcc gcc/5.3.0
9899# module load cray-netcdf
99100# module load cray-hdf5
100101# export NETCDF_ROOT=${NETCDF_DIR}
You can’t perform that action at this time.
0 commit comments