Skip to content

Commit

Permalink
- Enable configure for modelica3d
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12854 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Sep 10, 2012
1 parent d2ed14e commit aa062d9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Makefile.in
Expand Up @@ -75,6 +75,9 @@ qtclean: qtclean-common
endif

modelica3d:
ifeq (@MODELICA3D@,)
@echo Skipping Modelica3D
else
cd 3rdParty/modelica3d && mkdir -p build
cd 3rdParty/modelica3d/build && cmake -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DOSG_BACKEND=1 ..
$(MAKE) -C 3rdParty/modelica3d/build
Expand All @@ -85,6 +88,7 @@ modelica3d:
cp -p 3rdParty/modelica3d/examples/multibody/src/modelica/*.mo build/lib/omlibrary-modelica3d/
cp -p 3rdParty/modelica3d/backends/blender2.59/dbus-server.py build/lib/omlibrary-modelica3d/blender2.59/
cp -p 3rdParty/modelica3d/backends/osg-gtk/python/dbus-server.py build/lib/omlibrary-modelica3d/osg-gtk/
endif

fix-svn-eol-style:
svn propset svn:eol-style LF `find testsuite/ Compiler/ libraries/ -name "*.mo" | grep -v parser/ParseModel | grep -v "[ ]" | grep -v "_temp[0-9]*"`
Expand Down
9 changes: 9 additions & 0 deletions configure.in
Expand Up @@ -18,6 +18,7 @@ AC_SUBST(LIBSOCKET)
AC_SUBST(LIBNSL)
AC_SUBST(LIBLPSOLVE55)
AC_SUBST(LPSOLVEINC)
AC_SUBST(MODELICA3D)
AC_SUBST(USE_CORBA)
AC_SUBST(QT_USE_CORBA)
AC_SUBST(CORBA_QMAKE_INCLUDES)
Expand Down Expand Up @@ -467,6 +468,14 @@ else
AC_MSG_RESULT([yes])
fi

AC_MSG_CHECKING([if the user wants Modelica3D])
AC_ARG_ENABLE(modelica3d, [ --enable-modelica-3d[=yes] Modelica3D library.],[test "xno" = x"$enableval" && MODELICA3D=""],[MODELICA3D="yes"])
if test -z "$MODELICA3D" ; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
fi

dnl Check for Qt

AC_CHECK_PROGS(QMAKE,qmake-qt4 qmake-mac qmake,"")
Expand Down

0 comments on commit aa062d9

Please sign in to comment.