diff options
Diffstat (limited to 'science/dwave-preprocessing/files/patch-testscpp_Makefile')
| -rw-r--r-- | science/dwave-preprocessing/files/patch-testscpp_Makefile | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/science/dwave-preprocessing/files/patch-testscpp_Makefile b/science/dwave-preprocessing/files/patch-testscpp_Makefile index 35530211b3d6..e8c4e6997413 100644 --- a/science/dwave-preprocessing/files/patch-testscpp_Makefile +++ b/science/dwave-preprocessing/files/patch-testscpp_Makefile @@ -1,32 +1,32 @@ ---- testscpp/Makefile.orig 2022-05-07 23:28:35 UTC +--- testscpp/Makefile.orig 2022-12-19 19:58:20 UTC +++ testscpp/Makefile -@@ -1,22 +1,22 @@ - ROOT := ../ +@@ -1,10 +1,10 @@ + ROOT := .. SRC := $(ROOT)/dwave/preprocessing/ + CATCH2 := $(ROOT)/testscpp/Catch2/single_include/ -DIMOD := $(shell python -c 'import dimod; print(dimod.get_include())') +#DIMOD := $(shell python -c 'import dimod; print(dimod.get_include())') + SPDLOG := $(ROOT)/extern/spdlog/include/ + INCLUDES := -I $(SRC)/include/ -I $(DIMOD) -I $(CATCH2) -I $(SPDLOG) +-FLAGS := -std=c++17 -Wall -Wno-unknown-pragmas -Wno-sign-compare -Wno-deprecated-declarations -fcompare-debug-second -O3 ++FLAGS := ${CXXFLAGS} -std=c++17 -Wall -Wno-unknown-pragmas -Wno-sign-compare -Wno-deprecated-declarations - all: catch2 test_main test_main_parallel tests tests_parallel + all: update test_main test_main_parallel tests tests_parallel --tests: test_main.out -+tests: test_main - ./test_main - --tests_parallel: test_main_parallel.out -+tests_parallel: test_main_parallel +@@ -15,12 +15,12 @@ tests_parallel: test_main_parallel.out ./test_main_parallel test_main: test_main.cpp -- g++ -std=c++11 -Wall -c test_main.cpp -- g++ -std=c++11 -Wall test_main.o tests/*.cpp -o test_main -I $(SRC)/include/ -I $(DIMOD) -+ ${CXX} `pkg-config --cflags catch2` -std=c++11 -Wall -c test_main.cpp -+ ${CXX} `pkg-config --cflags catch2` -std=c++11 -Wall test_main.o tests/*.cpp -o test_main -I $(SRC)/include/ -I $(DIMOD) +- g++ $(FLAGS) -c test_main.cpp +- g++ $(FLAGS) test_main.o tests/*.cpp -o test_main $(INCLUDES) ++ ${CXX} $(FLAGS) -c test_main.cpp ++ ${CXX} $(FLAGS) ${LDFLAGS} test_main.o tests/*.cpp -o test_main $(INCLUDES) test_main_parallel: test_main.cpp -- g++ -std=c++11 -fopenmp -Wall -c test_main.cpp -o test_main_parallel.o -- g++ -std=c++11 -fopenmp -Wall test_main_parallel.o tests/*.cpp -o test_main_parallel -I $(SRC)/include/ -I $(DIMOD) -+ ${CXX} `pkg-config --cflags catch2` -std=c++11 -fopenmp -Wall -c test_main.cpp -o test_main_parallel.o -+ ${CXX} `pkg-config --cflags catch2` -std=c++11 -fopenmp -Wall test_main_parallel.o tests/*.cpp -o test_main_parallel -I $(SRC)/include/ -I $(DIMOD) +- g++ $(FLAGS) -fopenmp -c test_main.cpp -o test_main_parallel.o +- g++ $(FLAGS) -fopenmp test_main_parallel.o tests/*.cpp -o test_main_parallel $(INCLUDES) ++ ${CXX} $(FLAGS) -fopenmp -c test_main.cpp -o test_main_parallel.o ++ ${CXX} $(FLAGS) ${LDFLAGS} -fopenmp test_main_parallel.o tests/*.cpp -o test_main_parallel $(INCLUDES) - catch2: + update: git submodule init |