diff --git a/cmake/install/post/generate-adios2-config.sh.in b/cmake/install/post/generate-adios2-config.sh.in index fb8488cf0c..bf7537d5c1 100755 --- a/cmake/install/post/generate-adios2-config.sh.in +++ b/cmake/install/post/generate-adios2-config.sh.in @@ -103,7 +103,7 @@ fi for variant in $variants do - echo "Extacting ADIOS flags for C bindings (${variant})" + echo "Extracting ADIOS flags for C bindings (${variant})" echo " Without ADIOS" make_target_flags ${variant}_without_C without_C_CFLAGS=$(head -1 ${variant}_without_C.flags) @@ -119,7 +119,7 @@ do echo ADIOS2_C_CFLAGS_${variant}=\"${ADIOS2_C_CFLAGS}\" >> adios2.flags echo ADIOS2_C_LDFLAGS_${variant}=\"${ADIOS2_C_LDFLAGS}\" >> adios2.flags - echo "Extacting ADIOS flags for C++ bindings (${variant})" + echo "Extracting ADIOS flags for C++ bindings (${variant})" echo " Without ADIOS" make_target_flags ${variant}_without_CXX without_CXX_CXXFLAGS=$(head -1 ${variant}_without_CXX.flags) @@ -137,7 +137,7 @@ do if [ @ADIOS2_CONFIG_FORTRAN@ -eq 1 ] then - echo "Extacting ADIOS flags for Fortran bindings (${variant})" + echo "Extracting ADIOS flags for Fortran bindings (${variant})" echo " Without ADIOS" make_target_flags ${variant}_without_Fortran without_Fortran_FFLAGS=$(head -1 ${variant}_without_Fortran.flags) diff --git a/scripts/conda/adios2/superbuild/CMakeLists.txt b/scripts/conda/adios2/superbuild/CMakeLists.txt index 555268604f..75e2ad9840 100644 --- a/scripts/conda/adios2/superbuild/CMakeLists.txt +++ b/scripts/conda/adios2/superbuild/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.12) project(ADIOS2_SUPERBUILD C CXX) include(ExternalProject) diff --git a/scripts/dashboard/common.cmake b/scripts/dashboard/common.cmake index c7d7e84c73..e4284afa81 100644 --- a/scripts/dashboard/common.cmake +++ b/scripts/dashboard/common.cmake @@ -65,7 +65,7 @@ # set(ENV{FC} /path/to/fc) # Fortran compiler (optional) # set(ENV{LD_LIBRARY_PATH} /path/to/vendor/lib) # (if necessary) -cmake_minimum_required(VERSION 2.8.2 FATAL_ERROR) +cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) if(NOT DEFINED dashboard_full) set(dashboard_full TRUE) diff --git a/testing/install/C/Makefile b/testing/install/C/Makefile index b8734c2a80..87fc7114c5 100644 --- a/testing/install/C/Makefile +++ b/testing/install/C/Makefile @@ -39,7 +39,7 @@ adios_c_serial_test: main_nompi.o main_nompi.o: main_nompi.c $(CC) $(CFLAGS) $(ISYSROOT) -o main_nompi.o -c main_nompi.c $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -s --c-flags) -adios_c_serial_test_2: main_nompi.o +adios_c_serial_test_2: main_nompi.c $(CXX) $(LDFLAGS) $(CXXFLAGS) $(ISYSROOT) -o adios_c_serial_test_2 main_nompi.c $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -s -c) @@ -53,5 +53,5 @@ adios_c_mpi_test: main_mpi.o main_mpi.o: main_mpi.c $(CC) $(CFLAGS) $(ISYSROOT) -o main_mpi.o -c main_mpi.c $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -m --c-flags) -adios_c_mpi_test_2: main_mpi.o +adios_c_mpi_test_2: main_mpi.c $(CXX) $(LDFLAGS) $(CXXFLAGS) $(ISYSROOT) -o adios_c_mpi_test_2 main_mpi.c $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -m -c) diff --git a/testing/install/CXX11/Makefile b/testing/install/CXX11/Makefile index f499770fb7..1ed2765ec6 100644 --- a/testing/install/CXX11/Makefile +++ b/testing/install/CXX11/Makefile @@ -39,7 +39,7 @@ adios_cxx11_serial_test: main_nompi.o main_nompi.o: main_nompi.cxx $(CXX) $(CXXFLAGS) $(ISYSROOT) -o main_nompi.o -c main_nompi.cxx $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -s --cxx-flags) -adios_cxx11_serial_test_2: main_nompi.o +adios_cxx11_serial_test_2: main_nompi.cxx $(CXX) $(LDFLAGS) $(CXXFLAGS) $(ISYSROOT) -o adios_cxx11_serial_test_2 main_nompi.cxx $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -s -x) @@ -53,5 +53,5 @@ adios_cxx11_mpi_test: main_mpi.o main_mpi.o: main_mpi.cxx $(CXX) $(CXXFLAGS) $(ISYSROOT) -o main_mpi.o -c main_mpi.cxx $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -m --cxx-flags) -adios_cxx11_mpi_test_2: main_mpi.o +adios_cxx11_mpi_test_2: main_mpi.cxx $(CXX) $(LDFLAGS) $(CXXFLAGS) $(ISYSROOT) -o adios_cxx11_mpi_test_2 main_mpi.cxx $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -m -x) diff --git a/testing/install/Fortran/Makefile b/testing/install/Fortran/Makefile index 5149a077b6..fbb5b529fc 100644 --- a/testing/install/Fortran/Makefile +++ b/testing/install/Fortran/Makefile @@ -39,7 +39,7 @@ adios_fortran_serial_test: main_nompi.o main_nompi.o: main_nompi.f90 $(FC) $(FFLAGS) -o main_nompi.o -c main_nompi.f90 $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -s --fortran-flags) -adios_fortran_serial_test_2: main_nompi.o +adios_fortran_serial_test_2: main_nompi.f90 $(FC) $(FFLAGS) -o adios_fortran_serial_test_2 main_nompi.f90 $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -s -f) @@ -53,5 +53,5 @@ adios_fortran_mpi_test: main_mpi.o main_mpi.o: main_mpi.f90 $(FC) $(FFLAGS) -o main_mpi.o -c main_mpi.f90 $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -m --fortran-flags) -adios_fortran_mpi_test_2: main_mpi.o +adios_fortran_mpi_test_2: main_mpi.f90 $(FC) $(FFLAGS) -o adios_fortran_mpi_test_2 main_mpi.f90 $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -m -f)