Skip to content

Commit

Permalink
fix issues with OpenSuse (#7636)
Browse files Browse the repository at this point in the history
- installs liblpsolve55 in lib64, fix the copy
- add the path to ffi include when building the Compile runtime to fix:
  ./../../3rdParty/libffi/install/include/ffi.h:58:10: error: 'ffitarget.h'
  file not found with <angled> include; use "quotes" instead
  • Loading branch information
adrpo committed Jun 30, 2021
1 parent 56800bd commit 9af63be
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/runtime/Makefile.in
Expand Up @@ -34,7 +34,7 @@ CXX = @CXX@
IDL = @IDLCMD@
IDLPYTHON = @IDLPYTHONCMD@
CXXFLAGS = @CXXFLAGS@
CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/SimulationRuntime/c -I$(top_builddir)/SimulationRuntime/c/simulation/results -I$(top_builddir)/SimulationRuntime/c/util -I$(top_builddir)/SimulationRuntime/c/meta -I$(top_builddir)/SimulationRuntime/c/meta/gc -I. $(CORBAINCL) $(GCINCLUDE) -I$(FMIINCLUDE) -I$(GRAPHSTREAMINCLUDE) -I$(GRAPHINCLUDE) -I$(CJSONINCLUDE) -I$(ZMQINCLUDE) -I"$(TOP_DIR)/3rdParty/FMIL/ThirdParty/Zlib/zlib-1.2.6" -I"$(TOP_DIR)/3rdParty/FMIL/build/zlib/"
CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/SimulationRuntime/c -I$(top_builddir)/SimulationRuntime/c/simulation/results -I$(top_builddir)/SimulationRuntime/c/util -I$(top_builddir)/SimulationRuntime/c/meta -I$(top_builddir)/SimulationRuntime/c/meta/gc -I. $(CORBAINCL) $(GCINCLUDE) -I$(FMIINCLUDE) -I$(GRAPHSTREAMINCLUDE) -I$(GRAPHINCLUDE) -I$(CJSONINCLUDE) -I$(ZMQINCLUDE) -I"$(TOP_DIR)/3rdParty/FMIL/ThirdParty/Zlib/zlib-1.2.6" -I"$(TOP_DIR)/3rdParty/FMIL/build/zlib/" -I"$(TOP_DIR)/3rdParty/libffi/install/include/"
TRIPLE=@host_short@
SHREXT=@SHREXT@
RPATH=@RPATH@
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/runtime/Makefile.omdev.mingw
Expand Up @@ -49,7 +49,7 @@ OMCCORBASRC = omc_communication.o omc_communication_impl.o Corba_omc.o
SHELL = /bin/sh
CC = gcc
CXX = g++
override CFLAGS += -I. $(USE_CORBA) $(USE_METIS) -Werror=implicit-function-declaration -Wall -Wno-unused-variable -I../../ -I$(top_builddir) -I$(top_builddir)/SimulationRuntime/c -I$(top_builddir)/SimulationRuntime/c/simulation/results -I$(top_builddir)/SimulationRuntime/c/util -I$(top_builddir)/SimulationRuntime/c/meta -I$(top_builddir)/SimulationRuntime/c/meta/gc $(CORBAINCL) $(GCINCLUDE) -I$(FMIINCLUDE) -I$(GRAPHSTREAMINCLUDE) -I$(CJSONINCLUDE) -I$(GRAPHINCLUDE) -I$(LPSOLVEINCLUDE) -I$(SQLITE3INCLUDE) -I$(ZMQINCLUDE) -I"$(TOP_DIR)/3rdParty/FMIL/ThirdParty/Zlib/zlib-1.2.6" -I"$(TOP_DIR)/3rdParty/FMIL/build/zlib/"
override CFLAGS += -I. $(USE_CORBA) $(USE_METIS) -Werror=implicit-function-declaration -Wall -Wno-unused-variable -I../../ -I$(top_builddir) -I$(top_builddir)/SimulationRuntime/c -I$(top_builddir)/SimulationRuntime/c/simulation/results -I$(top_builddir)/SimulationRuntime/c/util -I$(top_builddir)/SimulationRuntime/c/meta -I$(top_builddir)/SimulationRuntime/c/meta/gc $(CORBAINCL) $(GCINCLUDE) -I$(FMIINCLUDE) -I$(GRAPHSTREAMINCLUDE) -I$(CJSONINCLUDE) -I$(GRAPHINCLUDE) -I$(LPSOLVEINCLUDE) -I$(SQLITE3INCLUDE) -I$(ZMQINCLUDE) -I"$(TOP_DIR)/3rdParty/FMIL/ThirdParty/Zlib/zlib-1.2.6" -I"$(TOP_DIR)/3rdParty/FMIL/build/zlib/" -I"$(TOP_DIR)/3rdParty/libffi/install/include/"
override CXXFLAGS += -std=c++11 $(CFLAGS)

include Makefile.common
2 changes: 1 addition & 1 deletion OMCompiler/Makefile.common
Expand Up @@ -579,7 +579,7 @@ graphstream-clean:
lpsolve: $(builddir_lib_omc)/liblpsolve55.a
$(builddir_lib_omc)/liblpsolve55.a: 3rdParty/lpsolve/Makefile
$(MAKE) -C 3rdParty/lpsolve/ install CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" -j1
cp -pf 3rdParty/lpsolve/build/lib/liblpsolve55* $(builddir_lib_omc)
cp -pf 3rdParty/lpsolve/build/lib*/liblpsolve55* $(builddir_lib_omc)
cp -prf 3rdParty/lpsolve/build/include/* $(builddir_inc)/
test ! `uname` = Darwin || install_name_tool -id @rpath/liblpsolve55.dylib "$(builddir_lib_omc)/liblpsolve55.dylib"
3rdParty/lpsolve/Makefile: 3rdParty/lpsolve/configure.ac
Expand Down

0 comments on commit 9af63be

Please sign in to comment.