Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Copy OMSens to build/share #7400

Merged
merged 1 commit into from
Apr 22, 2021
Merged

Copy OMSens to build/share #7400

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,12 @@ fast-test: testsuite-depends
$(MAKE) omc-diff
cd testsuite/partest && echo "Running $(./runtests.pl -f -counttests) fast tests"
cd testsuite/partest && ./runtests.pl -f -with-txt
omsens:
$(MAKE) -f $(defaultMakefileTarget) -C OMSens OMBUILDDIR=@OMBUILDDIR@
omsens-clean:
$(MAKE) -f $(defaultMakefileTarget) -C OMSens OMBUILDDIR=@OMBUILDDIR@ clean
omsens_qt: omsens_qt.skip
omsens_qt.skip:
omsens_qt.skip: omsens
$(MAKE) -f $(defaultMakefileTarget) -C OMSens_Qt || true

SOURCE_DIRS_UTF8=OMEdit OMShell/OMShell OMNotebook/OMNotebook OMOptim/OMOptim OMPlot/OMPlot OMCompiler/Compiler/ OMCompiler/SimulationRuntime/ `bash -c echo testsuite/flattening/libraries/3rdParty/{PlanarMechanics,siemens,SiemensPower,ThermoSysPro}` testsuite/openmodelica/modelicaML testsuite/AVM testsuite/simulation
Expand Down
2 changes: 1 addition & 1 deletion Makefile.omdev.mingw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ omsens:
omsens-clean:
$(MAKE) -f $(defaultMakefileTarget) -C OMSens OMBUILDDIR=$(OMBUILDDIR) clean

omsens_qt:
omsens_qt: omsens
$(MAKE) -f $(defaultMakefileTarget) -C OMSens_Qt OMBUILDDIR=$(OMBUILDDIR) CC="$(CC)" CXX="$(CXX)"

qtclients: omplot omedit omnotebook omshell omoptim omsens_qt
Expand Down
2 changes: 1 addition & 1 deletion OMSens
Open in desktop
Submodule OMSens updated 3 files
+3 −3 Makefile.omdev.mingw
+12 −0 Makefile.unix
+1 −1 setup.py
2 changes: 1 addition & 1 deletion OMSens_Qt
Open in desktop
Submodule OMSens_Qt updated 1 files
+1 −1 OMSensDialog.cpp