Symlink the dynamic library instead of messing with soname and instal…

…l_name

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18224 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Makefile.common

@@ -157,9 +157,9 @@ fmil:
 	(cd 3rdParty/FMIL/build && test -f Makefile || CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) -g" CPPFLAGS="$(CPPFLAGS)" $(CMAKE) -D CMAKE_AR:String="$(AR)" -D FMILIB_BUILD_SHARED_LIB:Bool=$(FMILIB_SHARED) "-DFMILIB_FMI_PLATFORM:String=$(MODELICA_SPEC_PLATFORM)" -D FMILIB_BUILD_TESTS:Bool=OFF -D FMILIB_GENERATE_DOXYGEN_DOC:Bool=OFF -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DFMILIB_INSTALL_PREFIX:String=../install .. -G $(CMAKE_TARGET))
 	test -f 3rdParty/FMIL/build/$(LIBFMILIB) || $(MAKE) -C 3rdParty/FMIL/build
 	test -d 3rdParty/FMIL/install || $(MAKE) -C 3rdParty/FMIL/build install
-	test ! -f 3rdParty/FMIL/build/libfmilib_shared$(SHREXT) || cp -p 3rdParty/FMIL/build/libfmilib_shared$(SHREXT) 3rdParty/FMIL/build/libfmilib$(SHREXT)
 	test "(" ! `uname` = Darwin ")" -o "(" ! -f 3rdParty/FMIL/build/libfmilib_shared$(SHREXT) ")" || install_name_tool -id @rpath/libfmilib$(SHREXT) 3rdParty/FMIL/build/libfmilib$(SHREXT)
 	cp -pPR 3rdParty/FMIL/build/$(LIBFMILIB) $(builddir_lib)/omc/
+	test ! -f build/lib/omc/libfmilib_shared$(SHREXT) || ln -sf libfmilib_shared$(SHREXT) build/lib/omc/libfmilib$(SHREXT)
 	#TODO: Only copy required headers, add them in omc/fmi subfolder, and do not copy c/txt-files
 	#cp -rp 3rdParty/FMIL/install/include/* $(builddir_inc)
 

configure.in

@@ -710,7 +710,7 @@ if test "Darwin" = `uname`; then
   LIBSIMULATION=libSimulationRuntimeC.a
   LIBRUNTIME=libOpenModelicaRuntimeC.a
   LIBFMIRUNTIME=libOpenModelicaFMIRuntimeC.a
-  LIBFMILIB=libfmilib.dylib
+  LIBFMILIB=libfmilib_shared.dylib
   FMILIB_SHARED=ON
   RT_LDFLAGS="$RT_LDFLAGS -liconv -lgc -lexpat $OPENMP"
   LINK="cp -fr"
@@ -747,7 +747,7 @@ else
   LIBSIMULATION=libSimulationRuntimeC.a
   LIBRUNTIME=libOpenModelicaRuntimeC.so
   LIBFMIRUNTIME=libOpenModelicaFMIRuntimeC.so
-  LIBFMILIB=libfmilib.so
+  LIBFMILIB=libfmilib_shared.so
   FMILIB_SHARED=ON
   RT_LDFLAGS="$RT_LDFLAGS -lrt -lgc -lexpat $OPENMP"
   LINK="cp -frl"