From 1f57456ed33638df9bd68134e744a1b15fe3212b Mon Sep 17 00:00:00 2001 From: Mahder Gebremedhin Date: Thu, 29 Oct 2020 12:49:09 +0100 Subject: [PATCH] Fix TBB include path. - TBB is now assumed to be in `OMCompiler/3rdParty/tbb` instead of `OMCompiler/3rdParty/tbb_cmake` --- OMCompiler/SimulationRuntime/ParModelica/auto/Makefile.in | 2 +- .../SimulationRuntime/ParModelica/auto/Makefile.omdev.mingw | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OMCompiler/SimulationRuntime/ParModelica/auto/Makefile.in b/OMCompiler/SimulationRuntime/ParModelica/auto/Makefile.in index 83fc1b83215..8fcda77a4c5 100644 --- a/OMCompiler/SimulationRuntime/ParModelica/auto/Makefile.in +++ b/OMCompiler/SimulationRuntime/ParModelica/auto/Makefile.in @@ -6,7 +6,7 @@ PARMODELICAAUTO_INC=$(OPENMODELICA_INC)/ParModelica/auto/ OPENMODELICA_LIB=$(TOP_BUILDDIR)/lib/@host_short@/omc OPENMODELICA_BIN=$(TOP_BUILDDIR)/bin/ -TBB_ROOT = $(OMCOMPILER_ROOT)/3rdParty/tbb_cmake/ +TBB_ROOT = $(OMCOMPILER_ROOT)/3rdParty/tbb/ BOOST_HOME = @BOOSTHOME@ INCDIRS = -I"../../c" -I$(BOOST_HOME) -I$(TBB_ROOT)/include -I$(OMCOMPILER_ROOT)/3rdParty/gc/include diff --git a/OMCompiler/SimulationRuntime/ParModelica/auto/Makefile.omdev.mingw b/OMCompiler/SimulationRuntime/ParModelica/auto/Makefile.omdev.mingw index 0cf8d15fbbc..3e062c7f301 100644 --- a/OMCompiler/SimulationRuntime/ParModelica/auto/Makefile.omdev.mingw +++ b/OMCompiler/SimulationRuntime/ParModelica/auto/Makefile.omdev.mingw @@ -6,7 +6,7 @@ PARMODELICAAUTO_INC=$(OPENMODELICA_INC)/ParModelica/auto/ OPENMODELICA_LIB=$(TOP_BUILDDIR)/lib/omc/ OPENMODELICA_BIN=$(TOP_BUILDDIR)/bin/ -TBB_ROOT = $(OMCOMPILER_ROOT)/3rdParty/tbb_cmake/ +TBB_ROOT = $(OMCOMPILER_ROOT)/3rdParty/tbb/ BOOST_HOME = $(OMDEV)/lib/3rdParty/boost-1_49 INCDIRS = -I"../../c" -I$(BOOST_HOME) -I$(TBB_ROOT)/include -I$(OMCOMPILER_ROOT)/3rdParty/gc/include