Skip to content

Commit

Permalink
- more fixes for Mac OS
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18839 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Jan 29, 2014
1 parent b7ab08e commit e6fb779
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile.common
Expand Up @@ -185,9 +185,9 @@ CMinpack:
(cd 3rdParty/CMinpack/build && test -f Makefile || CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(CMAKE) -D CMAKE_AR:String="$(AR)" -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DCMAKE_INSTALL_PREFIX:String=../install .. -G $(CMAKE_TARGET))
test -f 3rdParty/CMinpack/build/install/lib/$(LIBCMINPACKLIB) || $(MAKE) -C 3rdParty/CMinpack/build
test -d 3rdParty/CMinpack/install || $(MAKE) -C 3rdParty/CMinpack/build install
test ! `uname` = Darwin || install_name_tool -id @rpath/libcminpack.1.3.2.dylib path/to/3rdParty/CMinpack/install/lib/libcminpack.1.3.2.dylib
test ! `uname` = Darwin || install_name_tool -id @rpath/libcminpack.1.3.2.dylib 3rdParty/CMinpack/install/lib/libcminpack.1.3.2.dylib
# copy dll/so to lib/omc/ folders
(cp -af 3rdParty/CMinpack/install/lib*/$(LIBCMINPACK)$(SHREXT)* $(builddir_lib)/omc/)
(cp -af 3rdParty/CMinpack/install/lib*/$(LIBCMINPACK)*$(SHREXT)* $(builddir_lib)/omc/)
#TODO: Only copy required headers, add them in omc/fmi subfolder, and do not copy c/txt-files
#cp -rp 3rdParty/CMinpack/install/include/* $(builddir_inc)

Expand Down

0 comments on commit e6fb779

Please sign in to comment.