From 93abcfa48f2cf167a754a2292253bff1b01b8db5 Mon Sep 17 00:00:00 2001
From: Adeel Asghar <adeel.asghar@liu.se>
Date: Thu, 22 Apr 2021 17:38:57 +0200
Subject: [PATCH] Copy OMSens to build/share (#7400)

---
 Makefile.in          | 6 +++++-
 Makefile.omdev.mingw | 2 +-
 OMSens               | 2 +-
 OMSens_Qt            | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 33b49930720..2e2ab4647bf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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
diff --git a/Makefile.omdev.mingw b/Makefile.omdev.mingw
index 1f9bff7433d..f64314affb8 100644
--- a/Makefile.omdev.mingw
+++ b/Makefile.omdev.mingw
@@ -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
diff --git a/OMSens b/OMSens
index 10395b3169c..e3268e9e3ee 160000
--- a/OMSens
+++ b/OMSens
@@ -1 +1 @@
-Subproject commit 10395b3169c5a210eaef2f8d64146ec49668846f
+Subproject commit e3268e9e3ee9cf5129f6509351df084b2562be99
diff --git a/OMSens_Qt b/OMSens_Qt
index 10b63ca0f8f..0f7dfb0f5bf 160000
--- a/OMSens_Qt
+++ b/OMSens_Qt
@@ -1 +1 @@
-Subproject commit 10b63ca0f8f4b2b89311424d008396be7e74a6fc
+Subproject commit 0f7dfb0f5bfe1e0b0c534dc0ea28f9749a8adc31