Fix TBB include path.

- TBB is now assumed to be in `OMCompiler/3rdParty/tbb` instead of `OMCompiler/3rdParty/tbb_cmake`
OpenModelica · Oct 29, 2020 · 1f57456 · 1f57456
1 parent d5e172e
commit 1f57456
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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