blob: 35530211b3d6687ed7009433f71751416e99dc18 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
--- testscpp/Makefile.orig 2022-05-07 23:28:35 UTC
+++ testscpp/Makefile
@@ -1,22 +1,22 @@
ROOT := ../
SRC := $(ROOT)/dwave/preprocessing/
-DIMOD := $(shell python -c 'import dimod; print(dimod.get_include())')
+#DIMOD := $(shell python -c 'import dimod; print(dimod.get_include())')
all: catch2 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
./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)
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)
catch2:
git submodule init
|
