Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc cleanup of items identified in 2414 #2439

Merged
merged 3 commits into from
Aug 19, 2020
Merged

Misc cleanup of items identified in 2414 #2439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3dd4d5b
Fix *_test_2 makefile dependencies to use source instead of object files
Aug 19, 2020
0aa89ab
Fix typos in adios2-config generation script
Aug 19, 2020
13c9916
Bump minimum cmake versions in scripts as appropriate
Aug 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmake/install/post/generate-adios2-config.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion scripts/conda/adios2/superbuild/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.6)
cmake_minimum_required(VERSION 3.12)
project(ADIOS2_SUPERBUILD C CXX)

include(ExternalProject)
Expand Down
2 changes: 1 addition & 1 deletion scripts/dashboard/common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions testing/install/C/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand All @@ -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)
4 changes: 2 additions & 2 deletions testing/install/CXX11/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand All @@ -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)
4 changes: 2 additions & 2 deletions testing/install/Fortran/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand All @@ -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)