Skip to content

Commit

Permalink
Clean cmake crap better
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25050 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Mar 12, 2015
1 parent 0acd505 commit 138f2b4
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions Makefile.common
Expand Up @@ -210,7 +210,7 @@ qjson:
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)
cp -a 3rdParty/qjson-0.8.1/build/lib/libqjson*$(SHREXT)* $(builddir_lib)/omc/
cp -a 3rdParty/qjson-0.8.1/src/*.h 3rdParty/qjson-0.8.1/build/include/qjson

CMinpack:
test -d 3rdParty/CMinpack
mkdir -p 3rdParty/CMinpack/build
Expand All @@ -222,7 +222,7 @@ CMinpack:
(cp -af 3rdParty/CMinpack/install/lib*/$(LIBCMINPACKLIB)* $(builddir_lib)/omc)
# Darwin has to be special always
(test ! `uname` = Darwin || cp -af 3rdParty/CMinpack/install/lib*/*.dylib $(builddir_lib)/omc)

CMinpack-clean:
rm -rf 3rdParty/CMinpack/install
if test -f 3rdParty/CMinpack/build/Makefile; then make -C 3rdParty/CMinpack/build clean; fi
Expand All @@ -231,12 +231,11 @@ CMinpack-clean:
metis:
(cd 3rdParty/metis-5.1.0 && $(CMAKE) -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -G $(CMAKE_TARGET) && CC="$(CC)" CFLAGS="$(CFLAGS)" make)
cp 3rdParty/metis-5.1.0/libmetis/libmetis.a $(builddir_lib)/omc/

metis-clean:
if test -f 3rdParty/metis-5.1.0/Makefile; then make -C 3rdParty/metis-5.1.0 clean; fi
if test -f 3rdParty/metis-5.1.0/CMakeCache.txt; then rm 3rdParty/metis-5.1.0/CMakeCache.txt; fi
if test -f 3rdParty/metis-5.1.0/libmetis/libmetis.a; then rm 3rdParty/metis-5.1.0/libmetis/libmetis.a; fi

test ! -f 3rdParty/metis-5.1.0/Makefile || make -C 3rdParty/metis-5.1.0 clean
rm -rf 3rdParty/metis-5.1.0/CMakeCache.txt 3rdParty/metis-5.1.0/libmetis/libmetis.a 3rdParty/metis-5.1.0/CMakeFiles 3rdParty/metis-5.1.0/Makefile 3rdParty/metis-5.1.0/cmake_install.cmake 3rdParty/metis-5.1.0/include/CMakeFiles 3rdParty/metis-5.1.0/include/Makefile 3rdParty/metis-5.1.0/include/cmake_install.cmake 3rdParty/metis-5.1.0/libmetis/CMakeFiles 3rdParty/metis-5.1.0/libmetis/Makefile 3rdParty/metis-5.1.0/libmetis/cmake_install.cmake 3rdParty/metis-5.1.0/programs/CMakeFiles 3rdParty/metis-5.1.0/programs/Makefile 3rdParty/metis-5.1.0/programs/cmake_install.cmake

Cdaskr:
test -d 3rdParty/Cdaskr/solver
(cd 3rdParty/Cdaskr/solver && CC="$(CC)" CFLAGS="$(CFLAGS)" make -f Makefile)
Expand Down

0 comments on commit 138f2b4

Please sign in to comment.