Fix compilation problem of the GEOM module in --without-gui mode

This commit is contained in:
vsr 2010-06-17 13:02:20 +00:00
parent e591f0ec65
commit f2f21ff294
2 changed files with 10 additions and 12 deletions

View File

@ -274,16 +274,16 @@ if test "${gui_ok}" = "yes"; then
echo echo
CHECK_QT CHECK_QT
echo
echo ---------------------------------------------
echo testing VTK
echo ---------------------------------------------
echo
CHECK_VTK
fi fi
echo
echo ---------------------------------------------
echo testing VTK
echo ---------------------------------------------
echo
CHECK_VTK
echo echo
echo --------------------------------------------- echo ---------------------------------------------
echo testing HDF5 echo testing HDF5
@ -335,9 +335,9 @@ echo Configure
if test "${gui_ok}" = "yes"; then if test "${gui_ok}" = "yes"; then
variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok gui_ok" variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok gui_ok"
elif test "${SalomeGUI_need}" != "no"; then elif test "${SalomeGUI_need}" != "no"; then
variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok gui_ok" variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok gui_ok"
else else
variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok" variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
fi fi
for var in $variables for var in $variables

View File

@ -41,13 +41,11 @@ dist_libOCC2VTK_la_SOURCES = \
GEOM_WireframeFace.cxx GEOM_WireframeFace.cxx
libOCC2VTK_la_CPPFLAGS = \ libOCC2VTK_la_CPPFLAGS = \
$(QT_INCLUDES) \
$(CAS_CPPFLAGS) \ $(CAS_CPPFLAGS) \
$(VTK_INCLUDES) \ $(VTK_INCLUDES) \
$(KERNEL_CXXFLAGS) $(KERNEL_CXXFLAGS)
libOCC2VTK_la_LDFLAGS = \ libOCC2VTK_la_LDFLAGS = \
$(QT_MT_LIBS) \
$(CAS_KERNEL) -lTKBRep -lTKG2d -lTKG3d -lTKV3d -lTKMesh -lTKGeomBase -lTKGeomAlgo -lTKTopAlgo -lTKService \ $(CAS_KERNEL) -lTKBRep -lTKG2d -lTKG3d -lTKV3d -lTKMesh -lTKGeomBase -lTKGeomAlgo -lTKTopAlgo -lTKService \
$(VTK_LIBS) \ $(VTK_LIBS) \
$(KERNEL_LDFLAGS) -lSALOMELocalTrace $(KERNEL_LDFLAGS) -lSALOMELocalTrace