Skip to content
This repository has been archived by the owner on May 18, 2019. It is now read-only.

Added dependency for CPP runtime on Windows build #2816

Closed
wants to merge 1 commit into from
Closed

Added dependency for CPP runtime on Windows build #2816

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ all-runtimeCPPinstall: CMinpack sundials
omc-and-runtimeCPPinstall: CMinpack sundials
$(MAKE) omc runtimeCPPinstall OMBUILDDIR=$(OMBUILDDIR)

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

CMAKE_ARGS=$(filter CMAKE_%, $(MAKEFLAGS))
Expand All @@ -227,7 +227,7 @@ CMAKE_ARGS=$(filter CMAKE_%, $(MAKEFLAGS))
omcCAPIinstall:
$(MAKE) -C SimulationRuntime/cpp/ -f $(defaultMakefileTarget) omcCAPIinstall CC="$(CC)" CXX="$(CXX)" $(CMAKE_ARGS) OMBUILDDIR=$(OMBUILDDIR)

runtimeCPPinstall: CMinpack sundials
runtimeCPPinstall: runtimeCPP
$(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