ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-25 08:50:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

NRI : Merge from V1_2.

Browse Source
This commit is contained in:
nri 2003-07-10 14:28:33 +00:00
parent 7fcf0fe5b4
commit 00f9432431
12 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adm_local/unix/make_commence.in
View File

@ -144,7 +144,7 @@ CORBA_INCLUDES = @CORBA_INCLUDES@
CORBA_LIBS = @CORBA_LIBS@ CORBA_LIBS = @CORBA_LIBS@
CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ CORBA_CXXFLAGS = @CORBA_CXXFLAGS@
IDLCXXFLAGS = @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome
IDLPYFLAGS = @IDLPYFLAGS@ IDLPYFLAGS = @IDLPYFLAGS@
IDL = @IDL@ IDL = @IDL@

26
configure.in.base
View File

@ -140,13 +140,13 @@ echo
CHECK_PYTHON CHECK_PYTHON
echo dnl echo
echo --------------------------------------------- dnl echo ---------------------------------------------
echo testing java dnl echo testing java
echo --------------------------------------------- dnl echo ---------------------------------------------
echo dnl echo
CHECK_JAVA dnl CHECK_JAVA
echo echo
echo --------------------------------------------- echo ---------------------------------------------
@ -172,13 +172,13 @@ echo
CHECK_OMNIORB CHECK_OMNIORB
echo dnl echo
echo --------------------------------------------- dnl echo ---------------------------------------------
echo testing mico dnl echo testing mico
echo --------------------------------------------- dnl echo ---------------------------------------------
echo dnl echo
CHECK_MICO dnl CHECK_MICO
echo echo
echo --------------------------------------------- echo ---------------------------------------------
@ -264,7 +264,7 @@ echo ---------------------------------------------
echo echo
echo Configure echo Configure
variables="cc_ok lex_yacc_ok python_ok java_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok mico_ok occ_ok doxygen_ok graphviz_ok Kernel_ok" variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
for var in $variables for var in $variables
do do

2
src/ARCHIMEDE/Makefile.in
View File

@ -27,7 +27,7 @@
# $Header$ # $Header$
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=../../.. top_builddir=../..
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=.:@srcdir@:@top_srcdir@/idl VPATH=.:@srcdir@:@top_srcdir@/idl

2
src/GEOM/Makefile.in
View File

@ -27,7 +27,7 @@
# $Header$ # $Header$
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=../../.. top_builddir=../..
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=.:@srcdir@:@top_srcdir@/idl VPATH=.:@srcdir@:@top_srcdir@/idl

2
src/GEOMClient/Makefile.in
View File

@ -27,7 +27,7 @@
# $Header$ # $Header$
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=../../.. top_builddir=../..
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=.:@srcdir@:@top_srcdir@/idl VPATH=.:@srcdir@:@top_srcdir@/idl

2
src/GEOMDS/Makefile.in
View File

@ -27,7 +27,7 @@
# $Header$ # $Header$
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=../../.. top_builddir=../..
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=.:@srcdir@:@top_srcdir@/idl VPATH=.:@srcdir@:@top_srcdir@/idl

2
src/GEOMFiltersSelection/Makefile.in
View File

@ -27,7 +27,7 @@
# $Header$ # $Header$
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=../../.. top_builddir=../..
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=.:@srcdir@:@top_srcdir@/idl VPATH=.:@srcdir@:@top_srcdir@/idl

6
src/GEOMGUI/Makefile.in
View File

@ -27,7 +27,7 @@
# $Header$ # $Header$
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=../../.. top_builddir=../..
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=.:@srcdir@:@top_srcdir@/idl VPATH=.:@srcdir@:@top_srcdir@/idl
@ -168,8 +168,8 @@ LIB_SERVER_IDL =
# additionnal information to compil and link file # additionnal information to compil and link file
CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
CXXFLAGS += $(OCC_CXXFLAGS) CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGEOMClient -lGEOMObject -lGEOMFiltersSelection -lGEOMSketcher $(OCC_KERNEL_LIBS) $(OCC_MODELER_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGEOMClient -lGEOMObject -lGEOMFiltersSelection -lGEOMSketcher $(OCC_KERNEL_LIBS) $(OCC_MODELER_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome

2
src/GEOM_SWIG/Makefile.in
View File

@ -27,7 +27,7 @@
# $Header$ # $Header$
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=../../.. top_builddir=../..
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=.:@srcdir@:@top_srcdir@/idl VPATH=.:@srcdir@:@top_srcdir@/idl

2
src/OBJECT/Makefile.in
View File

@ -25,7 +25,7 @@
# Module : GEOM # Module : GEOM
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=../../.. top_builddir=../..
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=.:@srcdir@:@top_srcdir@/idl VPATH=.:@srcdir@:@top_srcdir@/idl

2
src/PARTITION/Makefile.in
View File

@ -27,7 +27,7 @@
# $Header$ # $Header$
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=../../.. top_builddir=../..
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=.:@srcdir@ VPATH=.:@srcdir@

2
src/SKETCHER/Makefile.in
View File

@ -27,7 +27,7 @@
# $Header$ # $Header$
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=../../.. top_builddir=../..
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=.:@srcdir@:@top_srcdir@/idl VPATH=.:@srcdir@:@top_srcdir@/idl