File tree 2 files changed +5
-1
lines changed
2 files changed +5
-1
lines changed Original file line number Diff line number Diff line change 14
14
set (CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR} /install" CACHE PATH "CMake install prefix" )
15
15
16
16
cmake_policy (SET CMP0048 NEW)
17
- project (Serialbox LANGUAGES C CXX VERSION 2.5.0 )
17
+ project (Serialbox LANGUAGES C CXX VERSION 2.5.1 )
18
18
cmake_minimum_required (VERSION 3.9.0)
19
19
20
20
set (CMAKE_CXX_EXTENSIONS OFF )
@@ -183,7 +183,10 @@ include(IDESupport)
183
183
184
184
#---------------------------------------- GTest ----------------------------------------------------
185
185
if (SERIALBOX_TESTING)
186
+ set (tmp_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS} )
187
+ set (BUILD_SHARED_LIBS OFF )
186
188
add_subdirectory (external/googletest)
189
+ set (BUILD_SHARED_LIBS ${tmp_BUILD_SHARED_LIBS} )
187
190
188
191
if (SERIALBOX_ENABLE_C)
189
192
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
95
95
FC_COMPILER=" pgfortran"
96
96
else
97
97
module swap PrgEnv-cray PrgEnv-gnu
98
+ module swap gcc gcc/5.3.0
98
99
# module load cray-netcdf
99
100
# module load cray-hdf5
100
101
# export NETCDF_ROOT=${NETCDF_DIR}
You can’t perform that action at this time.
0 commit comments