From 162724b0261367b1b74b042422a33f5dcd1d895d Mon Sep 17 00:00:00 2001 From: Adrian Pop Date: Mon, 16 Mar 2020 00:08:15 +0200 Subject: [PATCH] proper path to the shared fmilibrary to set rpath --- OMCompiler/Makefile.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OMCompiler/Makefile.common b/OMCompiler/Makefile.common index 7421250abfa..24d4e4aa3f7 100644 --- a/OMCompiler/Makefile.common +++ b/OMCompiler/Makefile.common @@ -254,7 +254,7 @@ $(OMBUILDDIR)/$(LIB_OMC)/$(LIBFMILIB): 3rdParty/FMIL/build/Makefile @# Pass CC/CFLAGS/CPPFLAGS because FMIL does not configure subprojects with the selected CC. Shocking; a cmake project not working the way it should. test -f 3rdParty/FMIL/build/$(LIBFMILIB) || CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C 3rdParty/FMIL/build test -d 3rdParty/FMIL/install || $(MAKE) -C 3rdParty/FMIL/build install - test "(" ! `uname` = Darwin ")" -o "(" ! -f 3rdParty/FMIL/install/libfmilib_shared$(SHREXT) ")" || install_name_tool -id @rpath/libfmilib_shared$(SHREXT) 3rdParty/FMIL/install/libfmilib_shared$(SHREXT) + test "(" ! `uname` = Darwin ")" -o "(" ! -f 3rdParty/FMIL/install/lib/libfmilib_shared$(SHREXT) ")" || install_name_tool -id @rpath/libfmilib_shared$(SHREXT) 3rdParty/FMIL/install/lib/libfmilib_shared$(SHREXT) cp -pPR 3rdParty/FMIL/install/lib/$(LIBFMILIB) $(builddir_lib_omc) @if [ "$(FMILIB_SHARED)" = "ON" ]; then\ cp -v -pPR 3rdParty/FMIL/install/lib/libfmilib_shared$(SHREXT) $(builddir_lib_omc);\