try to fix build for cpp runtime with cminpack

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18829 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jan 29, 2014 · db499b4 · db499b4
1 parent f1b3a19
commit db499b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/Makefile.common b/Makefile.common
@@ -185,6 +185,8 @@ 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
+	# copy dll/so to bin folder
+	(cp -puf 3rdParty/CMinpack/install/lib/$(LIBCMINPACKSO) $(builddir_bin)/)
 	#test "(" ! `uname` = Darwin ")" -o "(" ! -f 3rdParty/CMinpack/build/libfmilib_shared$(SHREXT) ")" || install_name_tool -id @rpath/libfmilib_shared$(SHREXT) 3rdParty/CMinpack/build/libfmilib_shared$(SHREXT)
 	#cp -pPR 3rdParty/CMinpack/build/install/$(LIBCMINPACKLIB) $(builddir_lib)/omc/
 	#test ! -f build/lib/omc/libfmilib_shared$(SHREXT) || ln -sf libfmilib_shared$(SHREXT) build/lib/omc/libfmilib$(SHREXT)

diff --git a/Makefile.in b/Makefile.in
@@ -34,6 +34,7 @@ LIBFMILIB=@LIBFMILIB@
 # This should probably have an @ around it
 # @Martin: Can you fix this, please?
 LIBCMINPACKLIB=libcminpack.a
+LIBCMINPACKSO=libcminpack.so*
 LD_LAPACK=@LD_LAPACK@
 LAPACK_TARGET=@LAPACK_TARGET@
 OPENBLAS_EXTRA_ARGS=@OPENBLAS_EXTRA_ARGS@