Skip to content

Commit

Permalink
Try to fix CI build
Browse files Browse the repository at this point in the history
  • Loading branch information
apontzen committed Apr 17, 2024
1 parent e8e2e5a commit 6bd76c1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
8 changes: 3 additions & 5 deletions genetIC/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@ GSLFLAGS = -lgsl -lgslcblas
FFTW = -DFFTW3 -DFFTW_THREADS
FFTWLIB = -lfftw3 -lfftw3f -lfftw3_threads

HDFLIB = -lhdf5 -lhdf5_cpp

# if pkg-config is installed, add $(pkg-config --libs-only-L hdf5) to HDFLIB:
HDFLIB += $(shell pkg-config --libs-only-L hdf5)
HDFLIB = $(shell pkg-config --libs-only-L hdf5) -lhdf5 -lhdf5_cpp

# add also $(pkg-config --cflags hdf5) to CFLAGS:
CFLAGS += $(shell pkg-config --cflags hdf5)
Expand Down Expand Up @@ -95,7 +93,7 @@ ifeq ($(HOST), clema)
endif

ifeq ($(HOST), butte)
CXX = /opt/homebrew/Cellar/llvm/17.0.6_1/bin/clang++
CXX = g++-12 # /opt/homebrew/Cellar/llvm/17.0.6_1/bin/clang++
CPATH = /opt/homebrew/include/
LPATH = /opt/homebrew/lib/
endif
Expand Down Expand Up @@ -149,7 +147,7 @@ all: genetIC
%.o: %.cpp ; $(CXX) $(CFLAGS) $(CODEOPTIONS) $(GIT_VARIABLES) -I$(CPATH) $(FFTW) -c $< -o $@

genetIC: src/main.o src/tools/filesystem.o src/tools/progress/progress.o src/tools/logging.o
$(CXX) $(CFLAGS) -o genetIC $(GIT_VARIABLES) -I$(CPATH) $(FFTW) $(HDFLIB) src/main.o src/tools/filesystem.o src/tools/progress/progress.o src/tools/logging.o -L$(LPATH) $(GSLFLAGS) -lm $(FFTWLIB)
$(CXX) $(CFLAGS) -o genetIC $(GIT_VARIABLES) -I$(CPATH) $(FFTW) src/main.o src/tools/filesystem.o src/tools/progress/progress.o src/tools/logging.o -L$(LPATH) $(GSLFLAGS) -lm $(FFTWLIB) $(HDFLIB)

clean:
rm -f genetIC
Expand Down
2 changes: 1 addition & 1 deletion genetIC/src/io.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ namespace io {
try {
int i = std::stoi(s);
format = static_cast<OutputFormat>(i);
} catch (std::invalid_argument e) {
} catch (const std::invalid_argument & e) {
if (s == "gadget2") {
format = OutputFormat::gadget2;
} else if (s == "gadget3") {
Expand Down
1 change: 0 additions & 1 deletion genetIC/src/tools/numerics/fourier.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#endif

#include <iostream>
#include <src/simulation/field/field.hpp>

#include "src/simulation/coordinate.hpp"
#include "src/tools/data_types/complex.hpp"
Expand Down

0 comments on commit 6bd76c1

Please sign in to comment.