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

Jump to bottom

Compile C code with CC #2414

Closed
wants to merge 2 commits into from
Closed

Compile C code with CC #2414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f44ded2
Compile C code with CC
NAThompson Aug 6, 2020
7dfef13
Uniform CMake version to green up build.
NAThompson Aug 6, 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 3.12)

if(NOT DEFINED dashboard_full)
set(dashboard_full TRUE)
Expand Down
2 changes: 1 addition & 1 deletion source/utils/bpls/bpls.cmake.gen.in
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)

if(OUTPUT_FILE)
set(output_arg OUTPUT_FILE "${OUTPUT_FILE}")
Expand Down
2 changes: 1 addition & 1 deletion testing/install/C/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# accompanying file Copyright.txt for details.
#------------------------------------------------------------------------------#

cmake_minimum_required(VERSION 3.6)
cmake_minimum_required(VERSION 3.12)
project(adios_c_test C)
enable_testing()

Expand Down
12 changes: 6 additions & 6 deletions testing/install/C/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,38 +20,38 @@ test: adios_c_test adios_c_test_2
$(mpiexec) ./adios_c_test_2

adios_c_test: main.o
$(CXX) $(LDFLAGS) $(CXXFLAGS) -o adios_c_test main.o $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) --c-libs)
$(CC) $(LDFLAGS) $(CFLAGS) -o adios_c_test main.o $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) --c-libs)

main.o: $(main_c)
$(CC) $(CFLAGS) $(ISYSROOT) -o main.o -c $(main_c) $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) --c-flags)

adios_c_test_2: $(main_c)
$(CXX) $(LDFLAGS) $(CXXFLAGS) $(ISYSROOT) -o adios_c_test_2 $(main_c) $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -c)
$(CC) $(LDFLAGS) $(CFLAGS) $(ISYSROOT) -o adios_c_test_2 $(main_c) $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -c)


test_serial: adios_c_serial_test adios_c_serial_test_2
./adios_c_serial_test
./adios_c_serial_test_2

adios_c_serial_test: main_nompi.o
$(CXX) $(LDFLAGS) $(CXXFLAGS) -o adios_c_serial_test main_nompi.o $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) --serial --c-libs)
$(CC) $(LDFLAGS) $(CFLAGS) -o adios_c_serial_test main_nompi.o $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) --serial --c-libs)

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
$(CXX) $(LDFLAGS) $(CXXFLAGS) $(ISYSROOT) -o adios_c_serial_test_2 main_nompi.c $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -s -c)
$(CC) $(LDFLAGS) $(CFLAGS) $(ISYSROOT) -o adios_c_serial_test_2 main_nompi.c $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -s -c)


test_mpi: adios_c_mpi_test adios_c_mpi_test_2
$(MPIEXEC) ./adios_c_mpi_test
$(MPIEXEC) ./adios_c_mpi_test_2

adios_c_mpi_test: main_mpi.o
$(CXX) $(LDFLAGS) $(CXXFLAGS) -o adios_c_mpi_test main_mpi.o $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) --mpi --c-libs)
$(CC) $(LDFLAGS) $(CFLAGS) -o adios_c_mpi_test main_mpi.o $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) --mpi --c-libs)

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
$(CXX) $(LDFLAGS) $(CXXFLAGS) $(ISYSROOT) -o adios_c_mpi_test_2 main_mpi.c $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -m -c)
$(CC) $(LDFLAGS) $(CFLAGS) $(ISYSROOT) -o adios_c_mpi_test_2 main_mpi.c $(shell adios2-config$(ADIOS2_EXECUTABLE_SUFFIX) -m -c)
2 changes: 1 addition & 1 deletion testing/install/CXX11/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# accompanying file Copyright.txt for details.
#------------------------------------------------------------------------------#

cmake_minimum_required(VERSION 3.6)
cmake_minimum_required(VERSION 3.12)
project(adios_cxx11_test CXX)
enable_testing()

Expand Down
2 changes: 1 addition & 1 deletion testing/install/Fortran/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# accompanying file Copyright.txt for details.
#------------------------------------------------------------------------------#

cmake_minimum_required(VERSION 3.6)
cmake_minimum_required(VERSION 3.12)
project(adios_fortran_test Fortran)
enable_testing()

Expand Down