Skip to content

Commit

Permalink
add more sundials dependecies so parallel make works
Browse files Browse the repository at this point in the history
  • Loading branch information
adrpo committed Sep 2, 2015
1 parent 3a5180c commit a1671c5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile.common
Expand Up @@ -75,7 +75,7 @@ interactive-common: .testvariables mkbuilddirs boehm-gc idl ModelicaExternalC
interactive-short: .testvariables interactive-common
$(MAKE) -C SimulationRuntime/c -f $(defaultMakefileTarget) bootstrap-dependencies OMBUILDDIR=$(OMBUILDDIR)

interactive: .testvariables interactive-common fmil lis Cdaskr CMinpack docs $(IPOPT_TARGET) $(UMFPACK_TARGET)
interactive: .testvariables interactive-common fmil lis Cdaskr CMinpack docs $(IPOPT_TARGET) $(UMFPACK_TARGET) $(MINGW_EXTRA_LIBS)
$(MAKE) -C SimulationRuntime/c -f $(defaultMakefileTarget) OMBUILDDIR=$(OMBUILDDIR)

docs:
Expand Down Expand Up @@ -169,13 +169,13 @@ omc-and-runtimeCPPinstall: mkbuilddirs
$(MAKE) CMinpack
$(MAKE) omc runtimeCPPinstall OMBUILDDIR=$(OMBUILDDIR)

runtimeCPP: CMinpack
runtimeCPP: CMinpack $(MINGW_EXTRA_LIBS)
$(MAKE) -C SimulationRuntime/cpp/ -f $(defaultMakefileTarget) OMBUILDDIR=$(OMBUILDDIR)

CMAKE_ARGS=$(filter CMAKE_%, $(MAKEFLAGS))


runtimeCPPinstall: CMinpack copycppheader omc
runtimeCPPinstall: CMinpack $(MINGW_EXTRA_LIBS) copycppheader omc
$(MAKE) -C SimulationRuntime/cpp/ -f $(defaultMakefileTarget) CC="$(CC)" CXX="$(CXX)" install ANALYZATION_MODE="$(ANALYZATION_MODE)" $(CMAKE_ARGS) OMBUILDDIR=$(OMBUILDDIR)
test ! `uname` = Darwin || install_name_tool -id @rpath/cpp/libOMCppCVode.dylib $(OMBUILDDIR)/$(LIB_OMC)/cpp/libOMCppCVode.dylib
test ! `uname` = Darwin || install_name_tool -id @rpath/cpp/libOMCppDataExchange.dylib $(OMBUILDDIR)/$(LIB_OMC)/cpp/libOMCppDataExchange.dylib
Expand Down

0 comments on commit a1671c5

Please sign in to comment.