1 diff -rupN MEDCOUPLING_ori/adm_local/CMakeLists.txt MEDCOUPLING_new/adm_local/CMakeLists.txt
\r
2 --- MEDCOUPLING_ori/adm_local/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
\r
3 +++ MEDCOUPLING_new/adm_local/CMakeLists.txt 2017-01-04 16:00:47.096478000 +0100
\r
5 +# Copyright (C) 2012-2016 CEA/DEN, EDF R&D
\r
7 +# This library is free software; you can redistribute it and/or
\r
8 +# modify it under the terms of the GNU Lesser General Public
\r
9 +# License as published by the Free Software Foundation; either
\r
10 +# version 2.1 of the License, or (at your option) any later version.
\r
12 +# This library is distributed in the hope that it will be useful,
\r
13 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
14 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
\r
15 +# Lesser General Public License for more details.
\r
17 +# You should have received a copy of the GNU Lesser General Public
\r
18 +# License along with this library; if not, write to the Free Software
\r
19 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
\r
21 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
\r
24 +ADD_SUBDIRECTORY(unix)
\r
25 diff -rupN MEDCOUPLING_ori/adm_local/unix/CMakeLists.txt MEDCOUPLING_new/adm_local/unix/CMakeLists.txt
\r
26 --- MEDCOUPLING_ori/adm_local/unix/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
\r
27 +++ MEDCOUPLING_new/adm_local/unix/CMakeLists.txt 2017-01-04 16:00:47.099483000 +0100
\r
29 +# Copyright (C) 2012-2016 CEA/DEN, EDF R&D
\r
31 +# This library is free software; you can redistribute it and/or
\r
32 +# modify it under the terms of the GNU Lesser General Public
\r
33 +# License as published by the Free Software Foundation; either
\r
34 +# version 2.1 of the License, or (at your option) any later version.
\r
36 +# This library is distributed in the hope that it will be useful,
\r
37 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
38 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
\r
39 +# Lesser General Public License for more details.
\r
41 +# You should have received a copy of the GNU Lesser General Public
\r
42 +# License along with this library; if not, write to the Free Software
\r
43 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
\r
45 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
\r
48 +ADD_SUBDIRECTORY(config_files)
\r
49 diff -rupN MEDCOUPLING_ori/adm_local/unix/config_files/check_MEDCOUPLING.m4 MEDCOUPLING_new/adm_local/unix/config_files/check_MEDCOUPLING.m4
\r
50 --- MEDCOUPLING_ori/adm_local/unix/config_files/check_MEDCOUPLING.m4 1970-01-01 01:00:00.000000000 +0100
\r
51 +++ MEDCOUPLING_new/adm_local/unix/config_files/check_MEDCOUPLING.m4 2017-01-04 16:00:47.105477000 +0100
\r
53 +dnl Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
\r
55 +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
\r
56 +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
\r
58 +dnl This library is free software; you can redistribute it and/or
\r
59 +dnl modify it under the terms of the GNU Lesser General Public
\r
60 +dnl License as published by the Free Software Foundation; either
\r
61 +dnl version 2.1 of the License, or (at your option) any later version.
\r
63 +dnl This library is distributed in the hope that it will be useful,
\r
64 +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
65 +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
\r
66 +dnl Lesser General Public License for more details.
\r
68 +dnl You should have received a copy of the GNU Lesser General Public
\r
69 +dnl License along with this library; if not, write to the Free Software
\r
70 +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
\r
72 +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
\r
75 +# Check availability of MEDCOUPLING binary distribution
\r
77 +# Author : Roman NIKOLAEV (OPEN CASCADE, 2016)
\r
80 +AC_DEFUN([CHECK_MEDCOUPLING],[
\r
81 +AC_REQUIRE([AC_LINKER_OPTIONS])dnl
\r
83 +AC_CHECKING(for MEDCOUPLING)
\r
87 +MEDCOUPLING_LDFLAGS=""
\r
88 +MEDCOUPLING_CXXFLAGS=""
\r
90 +AC_ARG_WITH(medcoupling,
\r
91 + [ --with-medcoupling=DIR root directory path of MEDCOUPLING installation ],
\r
92 + MEDCOUPLING_DIR="$withval",MEDCOUPLING_DIR="")
\r
94 +if test "x${MEDCOUPLING_DIR}" == "x" ; then
\r
95 + AC_MSG_RESULT(for \${MEDCOUPLING_ROOT_DIR}: ${MEDCOUPLING_ROOT_DIR})
\r
97 + # --with-medcoupling option is not used
\r
98 + if test "x${MEDCOUPLING_ROOT_DIR}" != "x" ; then
\r
99 + # MEDCOUPLING_ROOT_DIR environment variable defined
\r
100 + MEDCOUPLING_DIR=${MEDCOUPLING_ROOT_DIR}
\r
105 +if test -f ${MEDCOUPLING_DIR}/include/InterpKernelValue.hxx ; then
\r
106 + AC_MSG_RESULT(Using MEDCOUPLING module distribution in ${MEDCOUPLING_DIR})
\r
107 + MEDCOUPLING_ok=yes
\r
109 + AC_SUBST(MEDCOUPLING_ROOT_DIR)
\r
111 + MEDCOUPLING_LDFLAGS=-L${MEDCOUPLING_DIR}/lib${LIB_LOCATION_SUFFIX}
\r
112 + MEDCOUPLING_CXXFLAGS=-I${MEDCOUPLING_DIR}/include
\r
114 + AC_SUBST(MEDCOUPLING_LDFLAGS)
\r
115 + AC_SUBST(MEDCOUPLING_CXXFLAGS)
\r
118 + AC_MSG_WARN("Cannot find MCOUPLING module sources")
\r
121 +AC_MSG_RESULT(for MEDCOUPLING: $MEDCOUPLING_ok)
\r
124 diff -rupN MEDCOUPLING_ori/adm_local/unix/config_files/check_parmetis.m4 MEDCOUPLING_new/adm_local/unix/config_files/check_parmetis.m4
\r
125 --- MEDCOUPLING_ori/adm_local/unix/config_files/check_parmetis.m4 1970-01-01 01:00:00.000000000 +0100
\r
126 +++ MEDCOUPLING_new/adm_local/unix/config_files/check_parmetis.m4 2017-01-04 16:00:47.108474000 +0100
\r
128 +dnl Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
\r
130 +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
\r
131 +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
\r
133 +dnl This library is free software; you can redistribute it and/or
\r
134 +dnl modify it under the terms of the GNU Lesser General Public
\r
135 +dnl License as published by the Free Software Foundation; either
\r
136 +dnl version 2.1 of the License, or (at your option) any later version.
\r
138 +dnl This library is distributed in the hope that it will be useful,
\r
139 +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
140 +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
\r
141 +dnl Lesser General Public License for more details.
\r
143 +dnl You should have received a copy of the GNU Lesser General Public
\r
144 +dnl License along with this library; if not, write to the Free Software
\r
145 +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
\r
147 +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
\r
150 +#for a future use...see further down AC_DEFUN([CHECK_PARMETISV4]
\r
152 +#for use with ParMETIS V3
\r
153 +AC_DEFUN([CHECK_PARMETIS],[
\r
154 +AC_REQUIRE([AC_PROG_CC])dnl
\r
155 +AC_REQUIRE([AC_PROG_CPP])dnl
\r
156 +AC_REQUIRE([CHECK_MPI])dnl
\r
158 +AC_CHECKING(for ParMETIS V3 Library)
\r
163 +PARMETIS_CPPFLAGS=""
\r
165 +ENABLE_PARMETIS="no"
\r
167 +AC_CHECKING(for ParMETIS location)
\r
168 +AC_ARG_WITH(parmetis,
\r
169 + [ --with-parmetis=DIR root directory path to ParMETIS library installation ],
\r
170 + [PARMETISDIR="$withval"
\r
171 + AC_MSG_RESULT("select $withval as path to ParMETIS library")])
\r
173 +if test "x${PARMETISDIR}" == "x" ; then
\r
174 + AC_MSG_RESULT(for \${PARMETIS_ROOT_DIR}: ${PARMETIS_ROOT_DIR})
\r
175 + # --with-parmetis option is not used
\r
176 + if test "x${PARMETIS_ROOT_DIR}" != "x" ; then
\r
177 + PARMETISDIR=${PARMETIS_ROOT_DIR}
\r
181 +AC_MSG_RESULT(\$PARMETISDIR = ${PARMETISDIR})
\r
183 +CPPFLAGS_old="${CPPFLAGS}"
\r
186 +if test "x${PARMETISDIR}" != "x" ; then
\r
187 + PARMETIS_CPPFLAGS="-DMED_ENABLE_PARMETIS -I${PARMETISDIR} ${MPI_INCLUDES}"
\r
188 + PARMETIS_LIBS="-L${PARMETISDIR} -lparmetis -lmetis ${MPI_LIBS}"
\r
192 +parmetis_headers_ok=no
\r
193 +parmetis_binaries_ok=no
\r
195 +dnl ParMETIS headers
\r
196 +AC_CHECKING(for ParMETIS headers)
\r
197 +CPPFLAGS="${CPPFLAGS_old} ${PARMETIS_CPPFLAGS}"
\r
199 +parmetis_include_dir_ok=yes
\r
200 +if test "x${PARMETISDIR}" != "x" ; then
\r
201 + AC_CHECK_FILE(${PARMETISDIR}/parmetis.h,
\r
202 + parmetis_include_dir_ok=yes,
\r
203 + parmetis_include_dir_ok=no)
\r
206 +if test "x${parmetis_include_dir_ok}" = "xyes" ; then
\r
207 + AC_TRY_COMPILE([#include <parmetis.h>],
\r
208 + [ParMETIS_V3_PartGeom(0,0,0,0,0)],
\r
209 + parmetis_headers_ok=yes,
\r
210 + parmetis_headers_ok=no)
\r
213 +if test "x${parmetis_headers_ok}" = "xyes" ; then
\r
214 + AC_MSG_RESULT(\$PARMETIS_CPPFLAGS = ${PARMETIS_CPPFLAGS})
\r
216 +AC_MSG_RESULT(for ParMETIS headers: $parmetis_headers_ok)
\r
218 +if test "x${parmetis_headers_ok}" = "xyes" ; then
\r
219 + dnl ParMETIS binaries
\r
220 + AC_CHECKING(for ParMETIS binaries)
\r
221 + parmetis_lib_dir_ok=yes
\r
222 + AC_CHECK_FILE(${PARMETISDIR}/libparmetis.a,
\r
223 + parmetis_lib_dir_ok=yes,
\r
224 + parmetis_lib_dir_ok=no)
\r
226 + if test "x${parmetis_lib_dir_ok}" = "xyes" ; then
\r
227 + LIBS="${LIBS_old} ${PARMETIS_LIBS}"
\r
228 + AC_TRY_LINK([#include <parmetis.h>],
\r
229 + [ParMETIS_V3_PartGeom(0,0,0,0,0)],
\r
230 + parmetis_binaries_ok=yes,
\r
231 + parmetis_binaries_ok=no)
\r
235 +if test "x${parmetis_binaries_ok}" = "xyes" ; then
\r
236 + AC_MSG_RESULT(\$PARMETIS_LIBS = ${PARMETIS_LIBS})
\r
238 +AC_MSG_RESULT(for ParMETIS binaries: $parmetis_binaries_ok)
\r
240 +CPPFLAGS="${CPPFLAGS_old}"
\r
241 +LIBS="${LIBS_old}"
\r
243 +if test "x${parmetis_headers_ok}" = "xyes" ; then
\r
244 + if test "x${parmetis_binaries_ok}" = "xyes" ; then
\r
246 + ENABLE_PARMETIS="yes"
\r
247 + # ParMETIS includes METIS, so we redefine METIS cppflags and libs
\r
248 + # And metis.h #include parmetis.h + mpi.h
\r
250 + ENABLE_METIS="yes"
\r
251 + METISDIR=${PARMETISDIR}
\r
252 + METIS_CPPFLAGS="-DMED_ENABLE_METIS -I${METISDIR}/METISLib ${PARMETIS_CPPFLAGS}"
\r
253 + METIS_LIBS="-L${METISDIR} -lmetis ${MPI_LIBS}"
\r
257 +AC_MSG_RESULT(for ParMETIS: $parmetis_ok)
\r
259 +AC_SUBST(ENABLE_PARMETIS)
\r
260 +AC_SUBST(PARMETIS_CPPFLAGS)
\r
261 +AC_SUBST(PARMETIS_LIBS)
\r
262 +AC_SUBST(ENABLE_METIS)
\r
263 +AC_SUBST(METIS_CPPFLAGS)
\r
264 +AC_SUBST(METIS_LIBS)
\r
270 +#for a future use...
\r
271 +AC_DEFUN([CHECK_PARMETISV4],[
\r
272 +AC_REQUIRE([AC_PROG_CC])dnl
\r
273 +AC_REQUIRE([AC_PROG_CPP])dnl
\r
274 +AC_REQUIRE([CHECK_MPI])dnl
\r
276 +AC_CHECKING(for ParMETIS V4 Library)
\r
281 +PARMETIS_CPPFLAGS=""
\r
283 +ENABLE_PARMETIS="no"
\r
285 +AC_CHECKING(for ParMETIS location)
\r
286 +AC_ARG_WITH(parmetis,
\r
287 + [ --with-parmetis=DIR root directory path to ParMETIS library installation ],
\r
288 + [PARMETISDIR="$withval"
\r
289 + AC_MSG_RESULT("select $withval as path to ParMETIS library")])
\r
291 +AC_MSG_RESULT(\$PARMETISDIR = ${PARMETISDIR})
\r
293 +CPPFLAGS_old="${CPPFLAGS}"
\r
296 +if test "x${PARMETISDIR}" != "x" ; then
\r
297 + PARMETIS_CPPFLAGS="-DMED_ENABLE_PARMETIS -I${PARMETISDIR}/include ${MPI_INCLUDES}"
\r
298 + PARMETIS_LIBS="-L${PARMETISDIR}/lib -lparmetis -lmetis ${MPI_LIBS}"
\r
302 +parmetis_headers_ok=no
\r
303 +parmetis_binaries_ok=no
\r
305 +dnl ParMETIS headers
\r
306 +AC_CHECKING(for ParMETIS headers)
\r
307 +CPPFLAGS="${CPPFLAGS_old} ${PARMETIS_CPPFLAGS}"
\r
309 +parmetis_include_dir_ok=yes
\r
310 +if test "x${PARMETISDIR}" != "x" ; then
\r
311 + AC_CHECK_FILE(${PARMETISDIR}/include/parmetis.h,
\r
312 + parmetis_headers_ok=yes,
\r
313 + parmetis_headers_ok=no)
\r
316 +if test "x${parmetis_headers_ok}" = "xyes" ; then
\r
317 + AC_MSG_RESULT(\$PARMETIS_CPPFLAGS = ${PARMETIS_CPPFLAGS})
\r
319 +AC_MSG_RESULT(for ParMETIS headers: $parmetis_headers_ok)
\r
321 +if test "x${parmetis_headers_ok}" = "xyes" ; then
\r
322 + dnl ParMETIS binaries
\r
323 + AC_CHECKING(for ParMETIS binaries)
\r
324 + AC_CHECK_FILE(${PARMETISDIR}/lib/libparmetis.a,
\r
325 + parmetis_binaries_ok=yes,
\r
326 + parmetis_binaries_ok=no)
\r
329 +if test "x${parmetis_binaries_ok}" = "xyes" ; then
\r
330 + AC_MSG_RESULT(\$PARMETIS_LIBS = ${PARMETIS_LIBS})
\r
332 +AC_MSG_RESULT(for ParMETIS binaries: $parmetis_binaries_ok)
\r
334 +CPPFLAGS="${CPPFLAGS_old}"
\r
335 +LIBS="${LIBS_old}"
\r
337 +if test "x${parmetis_headers_ok}" = "xyes" ; then
\r
338 + if test "x${parmetis_binaries_ok}" = "xyes" ; then
\r
340 + ENABLE_PARMETIS="yes"
\r
344 +AC_MSG_RESULT(for ParMETIS: $parmetis_ok)
\r
346 +AC_SUBST(ENABLE_PARMETIS)
\r
347 +AC_SUBST(PARMETIS_CPPFLAGS)
\r
348 +AC_SUBST(PARMETIS_LIBS)
\r
353 diff -rupN MEDCOUPLING_ori/adm_local/unix/config_files/check_scotch.m4 MEDCOUPLING_new/adm_local/unix/config_files/check_scotch.m4
\r
354 --- MEDCOUPLING_ori/adm_local/unix/config_files/check_scotch.m4 1970-01-01 01:00:00.000000000 +0100
\r
355 +++ MEDCOUPLING_new/adm_local/unix/config_files/check_scotch.m4 2017-01-04 16:00:47.110484000 +0100
\r
357 +dnl Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
\r
359 +dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
\r
360 +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
\r
362 +dnl This library is free software; you can redistribute it and/or
\r
363 +dnl modify it under the terms of the GNU Lesser General Public
\r
364 +dnl License as published by the Free Software Foundation; either
\r
365 +dnl version 2.1 of the License, or (at your option) any later version.
\r
367 +dnl This library is distributed in the hope that it will be useful,
\r
368 +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
369 +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
\r
370 +dnl Lesser General Public License for more details.
\r
372 +dnl You should have received a copy of the GNU Lesser General Public
\r
373 +dnl License along with this library; if not, write to the Free Software
\r
374 +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
\r
376 +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
\r
379 +AC_DEFUN([CHECK_SCOTCH],[
\r
381 +AC_CHECKING(for scotch)
\r
387 +dnl default values
\r
389 +SCOTCH_CPPFLAGS="SCOTCH_CPPFLAGS_NOT_DEFINED"
\r
390 +SCOTCH_LIBS="SCOTCH_LIBS_NOT_FOUND"
\r
391 +SCOTCH_LIBSUFFIX="-not-defined"
\r
393 +ENABLE_SCOTCH="no"
\r
395 +AC_CHECKING(for scotch location)
\r
397 +AC_ARG_WITH(scotch,
\r
398 + [ --with-scotch=DIR root directory path to SCOTCH library installation ],
\r
399 + [SCOTCHDIR="$withval"
\r
400 + AC_MSG_RESULT([Select $withval as path to SCOTCH library])])
\r
402 +if test "x${SCOTCHDIR}" == "x" ; then
\r
403 + AC_MSG_RESULT(for \${SCOTCH_ROOT_DIR}: ${SCOTCH_ROOT_DIR})
\r
404 + # --with-scotch option is not used
\r
405 + if test "x${SCOTCH_ROOT_DIR}" != "x" ; then
\r
406 + SCOTCHDIR=${SCOTCH_ROOT_DIR}
\r
410 +if test "x${SCOTCHDIR}" = "x" ; then
\r
411 + AC_MSG_WARN(SCOTCHDIR is not specified)
\r
412 + AC_MSG_NOTICE(Trying native scotch...)
\r
416 +CPPFLAGS_old="${CPPFLAGS}"
\r
420 +scotch_headers_ok=no
\r
421 +scotch_binaries_ok=no
\r
424 +dnl SCOTCH headers
\r
426 +AC_CHECKING(for SCOTCH headers)
\r
428 +for d in ${SCOTCHDIR}/include ${SCOTCHDIR}/include/scotch ${SCOTCHDIR}/bin ${SCOTCHDIR} ; do
\r
430 + dnl check scotch.h file availability
\r
432 + AC_CHECK_FILE([${d}/scotch.h],
\r
433 + [scotch_include_dir_ok=yes],
\r
434 + [scotch_include_dir_ok=no])
\r
436 + if test "x${scotch_include_dir_ok}" = "xyes" ; then
\r
437 + LOCAL_INCLUDES="-DMED_ENABLE_SCOTCH -I${d} ${MPI_INCLUDES}"
\r
438 + CPPFLAGS="${CPPFLAGS_old} ${LOCAL_INCLUDES} -std=c99"
\r
440 + #include <stdio.h>
\r
441 + #include <scotch.h>
\r
443 + [SCOTCH_Graph* graph; SCOTCH_graphInit(graph)],
\r
444 + [scotch_headers_ok=yes],
\r
445 + [scotch_headers_ok=no])
\r
446 + if test "x${scotch_headers_ok}" = "xyes" ; then
\r
453 +dnl result for headers
\r
455 +AC_MSG_RESULT(for scotch headers: $scotch_headers_ok)
\r
458 +dnl SCOTCH libraries
\r
460 +if test "x${scotch_headers_ok}" = "xyes" ; then
\r
461 + AC_CHECKING(for scotch libraries)
\r
463 + for d in ${SCOTCHDIR}/lib ${SCOTCHDIR}/lib64 ${SCOTCHDIR}/lib/scotch ${SCOTCHDIR}/lib64/scotch ${SCOTCHDIR}/bin ${SCOTCHDIR} ; do
\r
464 + LOCAL_LIBS="-L${d} -lscotch -lscotcherr"
\r
465 + LIBS="${LIBS_old} ${LOCAL_LIBS}"
\r
467 + #include <stdio.h>
\r
468 + #include <scotch.h>
\r
470 + [SCOTCH_Graph* graph; SCOTCH_graphInit(graph)],
\r
471 + [scotch_binaries_ok=yes],
\r
472 + [scotch_binaries_ok=no])
\r
473 + if test "x${scotch_binaries_ok}" = "xyes" ; then
\r
480 +dnl result for libraries
\r
482 +AC_MSG_RESULT(for scotch libraries: $scotch_binaries_ok)
\r
487 +if test "x${scotch_binaries_ok}" = "xyes" ; then
\r
488 + SCOTCH_CPPFLAGS=${LOCAL_INCLUDES}
\r
489 + SCOTCH_LIBS=${LOCAL_LIBS}
\r
490 + SCOTCH_LIBSUFFIX=""
\r
491 + ENABLE_SCOTCH="yes"
\r
493 + AC_MSG_RESULT(\$SCOTCH_CPPFLAGS = ${SCOTCH_CPPFLAGS})
\r
494 + AC_MSG_RESULT(\$SCOTCH_LIBS = ${SCOTCH_LIBS})
\r
495 + AC_MSG_RESULT(\$SCOTCH_LIBSUFFIX = ${SCOTCH_LIBSUFFIX})
\r
497 +AC_MSG_RESULT(for scotch: $scotch_ok)
\r
499 +CPPFLAGS="${CPPFLAGS_old}"
\r
500 +LIBS="${LIBS_old}"
\r
502 +AC_SUBST(SCOTCH_CPPFLAGS)
\r
503 +AC_SUBST(SCOTCH_LIBSUFFIX)
\r
504 +AC_SUBST(SCOTCH_LIBS)
\r
505 +AC_SUBST(ENABLE_SCOTCH)
\r
512 diff -rupN MEDCOUPLING_ori/adm_local/unix/config_files/CMakeLists.txt MEDCOUPLING_new/adm_local/unix/config_files/CMakeLists.txt
\r
513 --- MEDCOUPLING_ori/adm_local/unix/config_files/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
\r
514 +++ MEDCOUPLING_new/adm_local/unix/config_files/CMakeLists.txt 2017-01-04 16:00:47.102538000 +0100
\r
516 +# Copyright (C) 2012-2016 CEA/DEN, EDF R&D
\r
518 +# This library is free software; you can redistribute it and/or
\r
519 +# modify it under the terms of the GNU Lesser General Public
\r
520 +# License as published by the Free Software Foundation; either
\r
521 +# version 2.1 of the License, or (at your option) any later version.
\r
523 +# This library is distributed in the hope that it will be useful,
\r
524 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
525 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
\r
526 +# Lesser General Public License for more details.
\r
528 +# You should have received a copy of the GNU Lesser General Public
\r
529 +# License along with this library; if not, write to the Free Software
\r
530 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
\r
532 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
\r
535 +SET(dist_admlocalm4_DATA
\r
536 + check_MEDCOUPLING.m4
\r
537 + check_parmetis.m4
\r
541 +FOREACH(f ${dist_admlocalm4_DATA})
\r
542 + SET(DEST adm_local/unix/config_files)
\r
543 + INSTALL(FILES ${f} DESTINATION ${DEST})
\r
544 +ENDFOREACH(f ${dist_admlocalm4_DATA})
\r
545 diff -rupN MEDCOUPLING_ori/CMakeLists.txt MEDCOUPLING_new/CMakeLists.txt
\r
546 --- MEDCOUPLING_ori/CMakeLists.txt 2017-01-17 09:39:14.489728365 +0100
\r
547 +++ MEDCOUPLING_new/CMakeLists.txt 2017-01-04 16:25:17.608100119 +0100
\r
548 @@ -214,6 +214,7 @@ IF(WIN32)
\r
551 ADD_SUBDIRECTORY(src)
\r
552 +ADD_SUBDIRECTORY(adm_local)
\r
553 ADD_SUBDIRECTORY(cmake_files)
\r
555 IF(MEDCOUPLING_BUILD_DOC)
\r