Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Join modifications from BR_Dev_For_4_0 tag V4_1_1.
[modules/smesh.git]
/
adm_local
/
unix
/
config_files
/
check_SMESH.m4
diff --git
a/adm_local/unix/config_files/check_SMESH.m4
b/adm_local/unix/config_files/check_SMESH.m4
index 86a8264b2b23f14fdd883020a4904a1d8fe2d677..5518cfa24e8dc98c020cecf2f234e14d781686f0 100644
(file)
--- a/
adm_local/unix/config_files/check_SMESH.m4
+++ b/
adm_local/unix/config_files/check_SMESH.m4
@@
-9,6
+9,9
@@
AC_CHECKING(for SMesh)
SMesh_ok=no
SMesh_ok=no
+SMESH_LDFLAGS=""
+SMESH_CXXFLAGS=""
+
AC_ARG_WITH(smesh,
[ --with-smesh=DIR root directory path of SMESH installation ],
SMESH_DIR="$withval",SMESH_DIR="")
AC_ARG_WITH(smesh,
[ --with-smesh=DIR root directory path of SMESH installation ],
SMESH_DIR="$withval",SMESH_DIR="")
@@
-25,7
+28,9
@@
if test "x$SMESH_DIR" == "x" ; then
else
# search SMESH binaries in PATH variable
else
# search SMESH binaries in PATH variable
- AC_PATH_PROG(TEMP, libSMESH_Swig.py)
+ #CCRTAC_PATH_PROG(TEMP, libSMESH_Swig.py)
+ #AC_PATH_PROG(TEMP, MED_Test)
+ AC_PATH_PROG(TEMP, smesh.py)
if test "x$TEMP" != "x" ; then
SMESH_BIN_DIR=`dirname $TEMP`
SMESH_DIR=`dirname $SMESH_BIN_DIR`
if test "x$TEMP" != "x" ; then
SMESH_BIN_DIR=`dirname $TEMP`
SMESH_DIR=`dirname $SMESH_BIN_DIR`
@@
-35,7
+40,9
@@
if test "x$SMESH_DIR" == "x" ; then
#
fi
#
fi
-if test -f ${SMESH_DIR}/bin/salome/libSMESH_Swig.py ; then
+#CCRTif test -f ${SMESH_DIR}/bin/salome/libSMESH_Swig.py ; then
+#if test -f ${SMESH_DIR}/bin/salome/MED_Test ; then
+if test -f ${SMESH_DIR}/bin/salome/smesh.py ; then
SMesh_ok=yes
AC_MSG_RESULT(Using SMesh module distribution in ${SMESH_DIR})
SMesh_ok=yes
AC_MSG_RESULT(Using SMesh module distribution in ${SMESH_DIR})
@@
-44,6
+51,12
@@
if test -f ${SMESH_DIR}/bin/salome/libSMESH_Swig.py ; then
fi
AC_SUBST(SMESH_ROOT_DIR)
fi
AC_SUBST(SMESH_ROOT_DIR)
+ SMESH_LDFLAGS=-L${SMESH_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
+ SMESH_CXXFLAGS=-I${SMESH_DIR}/include/salome
+
+ AC_SUBST(SMESH_LDFLAGS)
+ AC_SUBST(SMESH_CXXFLAGS)
+
else
AC_MSG_WARN("Cannot find compiled SMesh module distribution")
fi
else
AC_MSG_WARN("Cannot find compiled SMesh module distribution")
fi