Skip to content

Commit d992f29

Browse files
committed
Try to be smart about boost include
1 parent 718aee4 commit d992f29

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

Make/options

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ endif
1212
include ./versionRules/libraryRules
1313
include $(GENERAL_RULES)/module-path-user
1414

15+
BOOST_INCLUDE_DIR = $(if $(wildcard $(BOOST_ARCH_PATH)/boost),$(BOOST_ARCH_PATH),$(BOOST_ARCH_PATH)/include)
16+
1517
EXE_INC = \
1618
-I$(LIB_SRC)/finiteVolume/lnInclude \
1719
-I$(LIB_SRC)/OpenFOAM/lnInclude \
1820
-I$(LIB_SRC)/meshTools/lnInclude \
1921
-I$(LIB_SRC)/sampling/lnInclude \
2022
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
21-
-I$(BOOST_ARCH_PATH)/include \
23+
-I$(BOOST_INCLUDE_DIR) \
2224
$(INCOMPRESSIBLE_TURB_INC) \
2325
$(COMPRESSIBLE_TURB_INC) \
2426
$(INCOMPRESSIBLE_TRANSPORT_INC) \

tests/Make/options

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ ifeq ($(findstring clang, $(CC)), clang)
22
FLAGS = -Wno-inconsistent-missing-override
33
endif
44

5+
BOOST_INCLUDE_DIR = $(if $(wildcard $(BOOST_ARCH_PATH)/boost),$(BOOST_ARCH_PATH),$(BOOST_ARCH_PATH)/include)
6+
57
EXE_INC = -std=c++17 $(FLAGS) \
68
-I$(LIB_SRC)/finiteVolume/lnInclude \
79
-I$(LIB_SRC)/OpenFOAM/lnInclude \
@@ -11,7 +13,7 @@ EXE_INC = -std=c++17 $(FLAGS) \
1113
-I$(GTEST_DIR)/googletest/include \
1214
-I$(GTEST_DIR)/googlemock/include/gmock \
1315
-I$(GTEST_DIR)/googlemock/include \
14-
-I$(BOOST_ARCH_PATH)/include \
16+
-I$(BOOST_INCLUDE_DIR) \
1517
-I../lnInclude
1618

1719

0 commit comments

Comments
 (0)