Skip to content

Commit

Permalink
Attempt to fix #3056
Browse files Browse the repository at this point in the history
- only for Darwin: add -DBOOST_ROOT=/opt/local/include/boost/ to modelica3d build if /opt/local/include/boost/array.hpp exists

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25018 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Mar 10, 2015
1 parent 918039e commit 0f31e57
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Makefile.in
Expand Up @@ -50,6 +50,7 @@ FMILIB_SHARED = @FMILIB_SHARED@
CMINPACKLIB_SHARED = @CMINPACKLIB_SHARED@
MODELICA_SPEC_PLATFORM=@MODELICA_SPEC_PLATFORM@
SHREXT = @SHREXT@
BOOST_INCLUDE = @BOOST_INCLUDE@

include Makefile.common

Expand Down Expand Up @@ -152,7 +153,7 @@ ifeq (@MODELICA3D@,)
@echo Skipping Modelica3D
else
cd 3rdParty/modelica3d && mkdir -p build
cd 3rdParty/modelica3d/build && $(CMAKE_RPATH) -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DOSG_BACKEND=1 -DUSE_OMC=0 ..
cd 3rdParty/modelica3d/build && $(CMAKE_RPATH) -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DOSG_BACKEND=1 -DUSE_OMC=0 $(BOOST_INCLUDE) ..
$(MAKE) -C 3rdParty/modelica3d/build
cp -p 3rdParty/modelica3d/build/backends/osg-gtk/libm3d-osg-gtk$(SHREXT) 3rdParty/modelica3d/build/lib/proc3d/libproc3d$(SHREXT) build/lib/
test ! `uname` = Darwin || install_name_tool -id @rpath/libproc3d.dylib build/lib/libproc3d.dylib
Expand Down
15 changes: 15 additions & 0 deletions configure.in
Expand Up @@ -89,6 +89,8 @@ AC_SUBST(OMC)
AC_SUBST(OMCTARGET)
AC_SUBST(BOOTSTRAP_STATIC)
AC_SUBST(LIBDL)
AC_SUBST(LIBDL)
AC_SUBST(BOOST_INCLUDE)

FINAL_MESSAGES="\nConfigured OpenModelica successfully using the following options:"

Expand Down Expand Up @@ -229,6 +231,19 @@ if test ! "$DARWIN" = "1"; then
LIBS=""
fi

dnl Checks for boost include for Mac.

if test ! "$DARWIN" = "1"; then
if test -f "/opt/local/include/boost/array.hpp"; then
BOOST_INCLUDE="-DBOOST_ROOT=/opt/local/include/boost/"
else
BOOST_INCLUDE=""
fi
else
BOOST_INCLUDE=""
fi


dnl Checks for header files.
AC_HEADER_STDC

Expand Down

0 comments on commit 0f31e57

Please sign in to comment.