Skip to content

Commit c78e112

Browse files
author
Marcus Walther
committed
- added metis to windows build (mingw)
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25025 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 76e956b commit c78e112

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

Makefile.common

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ INSTALL_MANDIR = ${DESTDIR}${datadir}/man/
2424
INSTALL_JAVADIR = ${DESTDIR}${datadir}/omc/java
2525
INSTALL_LOCALEDIR = ${DESTDIR}${datadir}/locale
2626

27-
.PHONY : interactive omc release mosh all mkbuilddirs fmi test install-dirs susan susan_all susgen sustst install-python install-openturns runtimeCPPinstall CMinpack Cdaskr boehm-gc qtclients omshell omnotebook omedit omvisualize omoptim omoptimbasis
27+
.PHONY : interactive omc release mosh all mkbuilddirs fmi test install-dirs susan susan_all susgen sustst install-python install-openturns runtimeCPPinstall CMinpack metis Cdaskr boehm-gc qtclients omshell omnotebook omedit omvisualize omoptim omoptimbasis
2828

2929
mkbuilddirs:
3030
if [ "$(APP)" = ".app" ]; then mkdir -p $(builddir_app); fi
@@ -210,6 +210,7 @@ qjson:
210210
test "(" ! `uname` = Darwin ")" -o "(" ! -f 3rdParty/qjson-0.8.1/build/lib/libqjson$(SHREXT) ")" || install_name_tool -id @rpath/libqjson$(SHREXT) 3rdParty/qjson-0.8.1/build/lib/libqjson$(SHREXT)
211211
cp -a 3rdParty/qjson-0.8.1/build/lib/libqjson*$(SHREXT)* $(builddir_lib)/omc/
212212
cp -a 3rdParty/qjson-0.8.1/src/*.h 3rdParty/qjson-0.8.1/build/include/qjson
213+
213214
CMinpack:
214215
test -d 3rdParty/CMinpack
215216
mkdir -p 3rdParty/CMinpack/build
@@ -221,12 +222,21 @@ CMinpack:
221222
(cp -af 3rdParty/CMinpack/install/lib*/$(LIBCMINPACKLIB)* $(builddir_lib)/omc)
222223
# Darwin has to be special always
223224
(test ! `uname` = Darwin || cp -af 3rdParty/CMinpack/install/lib*/*.dylib $(builddir_lib)/omc)
224-
225+
225226
CMinpack-clean:
226227
rm -rf 3rdParty/CMinpack/install
227228
if test -f 3rdParty/CMinpack/build/Makefile; then make -C 3rdParty/CMinpack/build clean; fi
228229
rm -f 3rdParty/CMinpack/build/Makefile
229230

231+
metis:
232+
(cd 3rdParty/metis-5.1.0 && $(CMAKE) -G $(CMAKE_TARGET) && make)
233+
cp 3rdParty/metis-5.1.0/libmetis/libmetis.a $(builddir_lib)/omc/
234+
235+
metis-clean:
236+
if test -f 3rdParty/metis-5.1.0/Makefile; then make -C 3rdParty/metis-5.1.0 clean; fi
237+
if test -f 3rdParty/metis-5.1.0/CMakeCache.txt; then rm 3rdParty/metis-5.1.0/CMakeCache.txt; fi
238+
if test -f 3rdParty/metis-5.1.0/libmetis/libmetis.a; then rm 3rdParty/metis-5.1.0/libmetis/libmetis.a; fi
239+
230240
Cdaskr:
231241
test -d 3rdParty/Cdaskr/solver
232242
(cd 3rdParty/Cdaskr/solver && CC="$(CC)" CFLAGS="$(CFLAGS)" make -f Makefile)
@@ -331,7 +341,7 @@ openblas-clean:
331341
# OpenBLAS make clean actually gives error-messages. Let it do it, but silently
332342
$(MAKE) -C 3rdParty/OpenBLAS-0.2.8 clean > /dev/null 2>&1
333343

334-
clean: qtclean fmil-clean opencl_rt_clean gc-clean lis-clean runtimeCPPclean CMinpack-clean Cdaskr-clean bootstrap-clean msgpack-clean graphstream-clean openblas-clean umfpack-clean
344+
clean: qtclean fmil-clean opencl_rt_clean gc-clean lis-clean runtimeCPPclean CMinpack-clean metis-clean Cdaskr-clean bootstrap-clean msgpack-clean graphstream-clean openblas-clean umfpack-clean
335345
(cd SimulationRuntime/c && $(MAKE) -f $(defaultMakefileTarget) clean)
336346
(cd Compiler && $(MAKE) -f $(defaultMakefileTarget) clean)
337347
(cd Parser && $(MAKE) -f $(defaultMakefileTarget) clean)

0 commit comments

Comments
 (0)