Skip to content

Commit

Permalink
cppruntime uses cminpack
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@22965 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Oct 26, 2014
1 parent 1a65260 commit 8da37a6
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions Makefile.common
Expand Up @@ -115,24 +115,24 @@ build/lib/omc/libipopt.la: 3rdParty/Ipopt-3.11.6/Makefile
test ! `uname` = Darwin || install_name_tool -id @rpath/libcoinmumps.1.4.11.dylib 3rdParty/Ipopt-3.11.6/lib/libcoinmumps.1.4.11.dylib
cp -a 3rdParty/Ipopt-3.11.6/lib*/*.* build/lib/omc

ipopt: build/lib/omc/libipopt.la
build/lib/omc/libumfpack.a: 3rdParty/SuiteSparse/UMFPACK/Makefile
mkdir -p 3rdParty/SuiteSparse/build
cd 3rdParty/SuiteSparse/build && $(CMAKE) .. -G $(CMAKE_TARGET) -DCMAKE_INSTALL_PREFIX:PATH="../../../build"
$(MAKE) -C 3rdParty/SuiteSparse/build install
#cp -au 3rdParty/SuiteSparse/build/*.$(STATIC_EXT) build/lib/omc
#mkdir --parent build/include/omc/c/suitesparse
#cp -a 3rdParty/SuiteSparse/UMFPACK/Include/*.h build/include/omc/c/suitesparse
#cp -a 3rdParty/SuiteSparse/AMD/Include/*.h build/include/omc/c/suitesparse
ipopt: build/lib/omc/libipopt.la

build/lib/omc/libumfpack.a: 3rdParty/SuiteSparse/UMFPACK/Makefile
mkdir -p 3rdParty/SuiteSparse/build
cd 3rdParty/SuiteSparse/build && $(CMAKE) .. -G $(CMAKE_TARGET) -DCMAKE_INSTALL_PREFIX:PATH="../../../build"
$(MAKE) -C 3rdParty/SuiteSparse/build install
#cp -au 3rdParty/SuiteSparse/build/*.$(STATIC_EXT) build/lib/omc
#mkdir --parent build/include/omc/c/suitesparse
#cp -a 3rdParty/SuiteSparse/UMFPACK/Include/*.h build/include/omc/c/suitesparse
#cp -a 3rdParty/SuiteSparse/AMD/Include/*.h build/include/omc/c/suitesparse
#cp -a 3rdParty/SuiteSparse/UFconfig/*.h build/include/omc/c/suitesparse
umfpack: build/lib/omc/libumfpack.a
umfpack: build/lib/omc/libumfpack.a

umfpack-clean:
if test -d 3rdParty/SuiteSparse/build ; then cd 3rdParty/SuiteSparse/build && make clean ; fi
rm -rf build/include/omc/c/suitesparse
rm -f build/lib/omc/libumfpack.a
rm -f build/lib/omc/libamd.a
if test -d 3rdParty/SuiteSparse/build ; then cd 3rdParty/SuiteSparse/build && make clean ; fi
rm -rf build/include/omc/c/suitesparse
rm -f build/lib/omc/libumfpack.a
rm -f build/lib/omc/libamd.a

build/lib/omc/libopenblas_openmodelica.a:
$(MAKE) -C 3rdParty/OpenBLAS-0.2.8 CC="$(CC)" CXX="$(CXX)" FC="$(FC)" USE_THREAD=0 NO_LAPACKE=1 LIBNAMESUFFIX=openmodelica $(OPENBLAS_EXTRA_ARGS)
Expand All @@ -152,11 +152,11 @@ breakprocess:
(cd testsuite/openmodelica/bootstrapping && cp BreakProcess.exe ../../../$(builddir_bin)/)

all-runtimeCPPinstall:
$(MAKE) msl-external-libs
$(MAKE) msl-external-libs CMinpack
$(MAKE) all runtimeCPPinstall

omc-and-runtimeCPPinstall: mkbuilddirs
$(MAKE) msl-external-libs
$(MAKE) msl-external-libs CMinpack
$(MAKE) omc runtimeCPPinstall

runtimeCPP: msl-external-libs CMinpack
Expand Down

0 comments on commit 8da37a6

Please sign in to comment.