From cb91e6c1c514e4df3c40592504a93ec1454069b9 Mon Sep 17 00:00:00 2001 From: abn Date: Tue, 5 Jul 2016 10:27:32 +0200 Subject: [PATCH] Moving *all* CMake detection files to common CONFIGURATION repo. --- CMakeLists.txt | 4 +- DEPRECATED/Makefile.in | 154 ------ DEPRECATED/configure.in.base | 506 ------------------ DEPRECATED/make_config.in | 98 ---- salome_adm/CMakeLists.txt | 5 +- salome_adm/cmake_files/CMakeLists.txt | 29 - salome_adm/cmake_files/FindLibBatch.cmake | 54 -- salome_adm/cmake_files/FindPaco.cmake | 70 --- salome_adm/cmake_files/FindSalomeKERNEL.cmake | 63 --- .../cmake_files/FindSalomeLibBatch.cmake | 33 -- salome_adm/cmake_files/FindSalomePaco.cmake | 32 -- .../prepare_generating_doc.py | 0 12 files changed, 4 insertions(+), 1044 deletions(-) delete mode 100644 DEPRECATED/Makefile.in delete mode 100644 DEPRECATED/configure.in.base delete mode 100755 DEPRECATED/make_config.in delete mode 100755 salome_adm/cmake_files/CMakeLists.txt delete mode 100644 salome_adm/cmake_files/FindLibBatch.cmake delete mode 100644 salome_adm/cmake_files/FindPaco.cmake delete mode 100644 salome_adm/cmake_files/FindSalomeKERNEL.cmake delete mode 100644 salome_adm/cmake_files/FindSalomeLibBatch.cmake delete mode 100644 salome_adm/cmake_files/FindSalomePaco.cmake rename salome_adm/{cmake_files => }/prepare_generating_doc.py (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ff831e92..9cc66967e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,7 @@ SET(${PROJECT_NAME_UC}_VERSION SET(${PROJECT_NAME_UC}_VERSION_DEV 1) # Common CMake macros +# =================== SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files") IF(EXISTS ${CONFIGURATION_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake") @@ -44,9 +45,6 @@ IF(EXISTS ${CONFIGURATION_ROOT_DIR}) ELSE() MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !") ENDIF() -# Our macros -LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/salome_adm/cmake_files") - # Platform setup # ============== diff --git a/DEPRECATED/Makefile.in b/DEPRECATED/Makefile.in deleted file mode 100644 index a3cd8f5c6..000000000 --- a/DEPRECATED/Makefile.in +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# -* Makefile *- -# Author : Patrick GOLDBRONN (CEA) -# Date : 28/06/2001 -# $Header$ -# source path -# -top_srcdir=@top_srcdir@ -top_builddir=. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:@top_srcdir@/resources:./bin:@top_srcdir@/idl - - -@COMMENCE@ - -SUBDIRS = idl src doc salome_adm - -RESOURCES_FILES = \ -CatalogDataType.xml \ -KERNELCatalog.xml \ -CatalogResources.xml \ -close.png \ -config \ -channel.cfg \ -SALOMEDS_Resources - -BIN_SCRIPT= \ -runIDLparser \ -VERSION \ -orbmodule.py \ -runSalome.py \ -killSalome.py \ -killSalomeWithPort.py \ -runSalome \ -runSalome.csh \ -runNS.sh \ -createAppli.sh \ -launchConfigureParser.py \ -salome.launch \ -envSalome.py \ -salomeConsole.py \ -showNS.py \ -addToKillList.py - -# copy header files in common directory -include_list=\ - include/salome/SALOMEconfig.h - -inc: idl $(include_list) - -include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref - -$(RM) $@ - $(LN_S) ../../$< $@ - -# test if SALOMEconfig.h has changed (contents) -salome_adm/unix/SALOMEconfig.ref: salome_adm/unix/SALOMEconfig.h - @if ! [ -a $@ ]; then \ - cp -p $< $@; \ - fi; \ - if ! cmp $< $@; then \ - cp -p $< $@; \ - fi; \ - -depend: depend_idl - -depend_idl: - (cd idl ; $(MAKE) $@) || exit 1 - -# doc is already build : if you want to had documents, go manually to doc and run 'make doc' - - -DOCFILES=\ - README.FIRST.html - -rstdoc: $(DOCFILES) - (cd doc && $(MAKE) $@) || exit 1 - - -# Install make_commence make_conclude ... for other modules -install-make: - ($(INSTALL) -d $(incmakedir) || exit 1); - (sed 's/^prefix=/#prefix=/' $(top_builddir)/salome_adm/unix/make_commence > $(incmakedir)/make_commence || exit 1); - (sed 's/^prefix=/#prefix=/' $(top_builddir)/salome_adm/unix/make_conclude > $(incmakedir)/make_conclude || exit 1); - - -install-end: -# finish libtool install -# @$(LT) --mode=finish $(libdir) - -install-include: $(include_list) - $(INSTALL) -d $(includedir) - @for f in X $(include_list); do \ - if test $$f != X; then \ - (cp -p $$f $(includedir) || exit 1); \ - fi; \ - done - -# install script in $(bindir) : -install-appliskel: - $(INSTALL) -d $(bindir) - if test -d $(top_builddir)/bin/salome/appliskel; then \ - cp -rp $(top_builddir)/bin/salome/appliskel $(bindir); \ - fi; - -install-bin: $(BIN_SCRIPT) - $(INSTALL) -d $(bindir) - $(INSTALL_PROGRAM) $^ $(bindir) - -# install Plugin file -install-plugin: $(top_builddir)/share/salome/resources/Plugin - ($(INSTALL_DATA) $^ $(datadir)/resources/. || exit 1); \ - -uninstall: uninstall-idl - -uninstall-idl: - $(RM) $(idldir)/*.idl - -distclean: distclean-other - -distclean-other: - -$(RM) salome_adm/unix/*~ salome_adm/unix/*% salome_adm/unix/*.bak salome_adm/unix/*.new salome_adm/unix/*.old - -$(RM) salome_adm/unix/make_* - -$(RM) salome_adm/unix/depend salome_adm/unix/SALOMEconfig.h - -$(RM) config.cache config.log config.status - -@MODULE@ - -$(top_builddir)/share/salome/resources/Plugin: resources/Plugin - cp -f $< $@ ; \ - -resources: $(top_builddir)/share/salome/resources/Plugin - -install: install-bin install-appliskel install-include install-make install-plugin install-end diff --git a/DEPRECATED/configure.in.base b/DEPRECATED/configure.in.base deleted file mode 100644 index b22a31a2d..000000000 --- a/DEPRECATED/configure.in.base +++ /dev/null @@ -1,506 +0,0 @@ -# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# PLEASE DO NOT MODIFY configure.in FILE -# ALL CHANGES WILL BE DISCARDED BY THE NEXT -# build_configure COMMAND -# CHANGES MUST BE MADE IN configure.in.base FILE -# Author : Marc Tajchman (CEA) -# Date : 28/06/2001 -# Modified by : Patrick GOLDBRONN (CEA) -# Modified by : Marc Tajchman (CEA) -# Created from configure.in.base -# -AS_SHELL_SANITIZES -AC_INIT(src) -AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) -AC_CANONICAL_HOST - -PACKAGE=salome -AC_SUBST(PACKAGE) - -VERSION=3.2.1 -AC_SUBST(VERSION) -XVERSION=0x030201 -AC_SUBST(XVERSION) - -# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) -MODULE_NAME=kernel -AC_SUBST(MODULE_NAME) - -dnl -dnl Initialize source and build root directories -dnl - -ROOT_BUILDDIR=`pwd` -ROOT_SRCDIR=`echo $0 | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` -cd $ROOT_SRCDIR -ROOT_SRCDIR=`pwd` -cd $ROOT_BUILDDIR - -AC_SUBST(ROOT_SRCDIR) -AC_SUBST(ROOT_BUILDDIR) -dnl ########################################################## -AC_SUBST(KERNEL_ROOT_DIR) -dnl ########################################################## - - -echo -echo Source root directory : $ROOT_SRCDIR -echo Build root directory : $ROOT_BUILDDIR -echo -echo - -dnl Modification B. Secher portage sur osf -AC_CHECK_PROG(SHELL,sh) -AC_SUBST(SHELL) - -if test -z "$AR"; then - AC_CHECK_PROGS(AR,ar xar,:,$PATH) -fi -AC_SUBST(AR) - -dnl Export the AR macro so that it will be placed in the libtool file -dnl correctly. -export AR - -echo -echo --------------------------------------------- -echo testing make -echo --------------------------------------------- -echo - -AC_PROG_MAKE_SET -AC_PROG_INSTALL -dnl -dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques ! - -AC_ENABLE_DEBUG(yes) -AC_DISABLE_PRODUCTION - -echo --------------------------------------------- -echo testing libtool -echo --------------------------------------------- - -dnl first, we set static to no! -dnl if we want it, use --enable-static -AC_ENABLE_STATIC(no) - -AC_LIBTOOL_DLOPEN -AC_PROG_LIBTOOL - -dnl Fix up the INSTALL macro if it s a relative path. We want the -dnl full-path to the binary instead. -case "$INSTALL" in - *install-sh*) - INSTALL="${ROOT_SRCDIR}/salome_adm/unix/config_files/install-sh -c" - ;; -esac - -echo -echo --------------------------------------------- -echo testing C/C++ -echo --------------------------------------------- -echo - -cc_ok=no -dnl inutil car libtool -dnl AC_PROG_CC -AC_PROG_CXX -AC_CXX_WARNINGS -AC_CXX_TEMPLATE_OPTIONS -AC_DEPEND_FLAG -# AC_CC_WARNINGS([ansi]) -cc_ok=yes - -dnl Library libdl : -AC_CHECK_LIB(dl,dlopen) - -dnl Library librt : for alpha/osf -AC_CHECK_LIB(rt,nanosleep) - -dnl add library libm : -AC_CHECK_LIB(m,ceil) - -AC_CXX_USE_STD_IOSTREAM -AC_CXX_HAVE_SSTREAM - -dnl -dnl --------------------------------------------- -dnl testing linker -dnl --------------------------------------------- -dnl - -AC_LINKER_OPTIONS - -echo -echo --------------------------------------------- -echo testing threads -echo --------------------------------------------- -echo - -ENABLE_PTHREADS - -dnl -dnl --------------------------------------------- -dnl testing WITHIHM -dnl --------------------------------------------- -dnl - -CHECK_WITHIHM - -echo -echo --------------------------------------------- -echo BOOST Library -echo --------------------------------------------- -echo - -CHECK_BOOST - -dnl -dnl --------------------------------------------- -dnl testing MPI -dnl --------------------------------------------- -dnl - -CHECK_MPI - -dnl -dnl --------------------------------------------- -dnl testing sockets -dnl --------------------------------------------- -dnl - -CHECK_SOCKETS - -dnl -dnl --------------------------------------------- -dnl testing OpenPBS -dnl --------------------------------------------- -dnl - -echo -echo --------------------------------------------- -echo testing OpenPBS -echo --------------------------------------------- -echo - -openpbs_ok=no -CHECK_OPENPBS -dnl openpbs_ok is set to yes by CHECK_OPENPBS - -dnl -dnl --------------------------------------------- -dnl testing LSF -dnl --------------------------------------------- -dnl - -echo -echo --------------------------------------------- -echo testing LSF -echo --------------------------------------------- -echo - -lsf_ok=no -CHECK_LSF -dnl lsf_ok is set to yes by CHECK_LSF - -dnl -dnl --------------------------------------------- -dnl testing Batch -dnl --------------------------------------------- -dnl - -WITH_BATCH=no -test x$openpbs_ok = xyes || test x$lsf_ok = xyes && WITH_BATCH=yes -AC_SUBST(WITH_BATCH) - -echo -echo --------------------------------------------- -echo testing LEX \& YACC -echo --------------------------------------------- -echo - -lex_yacc_ok=no -AC_PROG_YACC -AC_PROG_LEX -lex_yacc_ok=yes - -echo -echo --------------------------------------------- -echo testing python -echo --------------------------------------------- -echo - -CHECK_PYTHON - -dnl echo -dnl echo --------------------------------------------- -dnl echo testing java -dnl echo --------------------------------------------- -dnl echo - -dnl CHECK_JAVA - -echo -echo --------------------------------------------- -echo testing swig -echo --------------------------------------------- -echo - -CHECK_SWIG - -echo -echo --------------------------------------------- -echo testing omniORB -echo --------------------------------------------- -echo - -CHECK_OMNIORB - -dnl echo -dnl echo --------------------------------------------- -dnl echo testing mico -dnl echo --------------------------------------------- -dnl echo - -dnl CHECK_MICO - -echo -echo --------------------------------------------- -echo default ORB : omniORB -echo --------------------------------------------- -echo - -DEFAULT_ORB=omniORB -CHECK_CORBA - -AC_SUBST_FILE(CORBA) -corba=make_$ORB -CORBA=salome_adm/unix/$corba - - -echo -echo --------------------------------------------- -echo testing QT -echo --------------------------------------------- -echo - -CHECK_QT - -echo -echo ---------------------------------------------- -echo testing CPPUNIT only required for unit testing -echo ---------------------------------------------- -echo - -CHECK_CPPUNIT - -if test "X$WITHIHM" = "Xyes"; then - echo - echo --------------------------------------------- - echo Testing sip - echo --------------------------------------------- - echo - - CHECK_SIP - - echo - echo --------------------------------------------- - echo testing openGL - echo --------------------------------------------- - echo - - CHECK_OPENGL - - echo - echo --------------------------------------------- - echo testing VTK - echo --------------------------------------------- - echo - - CHECK_VTK - - echo - echo --------------------------------------------- - echo Testing pyqt - echo --------------------------------------------- - echo - - CHECK_PYQT - - echo - echo --------------------------------------------- - echo Testing qwt - echo --------------------------------------------- - echo - - CHECK_QWT -fi - -echo -echo --------------------------------------------- -echo testing HDF5 -echo --------------------------------------------- -echo - -CHECK_HDF5 - -echo -echo --------------------------------------------- -echo Testing OpenCascade -echo --------------------------------------------- -echo - -CHECK_CAS - -echo -echo --------------------------------------------- -echo Testing html generators -echo --------------------------------------------- -echo - -CHECK_HTML_GENERATORS - -echo -echo --------------------------------------------- -echo Summary -echo --------------------------------------------- -echo - -echo Configure -variables="cc_ok boost_ok lex_yacc_ok mpi_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok sip_ok pyqt_ok qwt_ok doxygen_ok graphviz_ok" - -for var in $variables -do - eval toto=\$$var - if test x$toto != "x"; then - printf " %10s : " `echo \$var | sed -e "s,_ok,,"` - eval echo \$$var - fi -done -echo "---Optional:" -variables="cppunit_ok openpbs_ok lsf_ok" - -for var in $variables -do - eval toto=\$$var - if test x$toto != "x"; then - printf " %10s : " `echo \$var | sed -e "s,_ok,,"` - eval echo \$$var - fi -done - -echo -echo "Default ORB : $DEFAULT_ORB" -echo - -dnl generals files which could be included in every makefile - -AC_SUBST_FILE(COMMENCE) COMMENCE=salome_adm/unix/make_commence -AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude -AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module - -dnl les dependences -AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend - -dnl We don t need to say when we re entering directories if we re using -dnl GNU make becuase make does it for us. -if test "X$GMAKE" = "Xyes"; then - AC_SUBST(SETX) SETX=":" -else - AC_SUBST(SETX) SETX="set -x" -fi - -# make other build directories -for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl -# if test ! -d $rep ; then -# eval mkdir $rep -# fi - $INSTALL -d $rep -done - -echo -echo --------------------------------------------- -echo copying resource files, shell scripts, and -echo xml files -echo --------------------------------------------- -echo - - -dnl copy resources directories - -#for i in `find $ROOT_SRCDIR -name 'resources' -print` -#do -# local_res=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"` -# local_res_dir=`echo $local_res | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` -# mkdir -p $local_res_dir -# cd $local_res_dir -# ln -fs $i -# echo $local_res -# cd $ROOT_BUILDDIR -#done - -dnl copy shells and utilities contained in the bin directory -dnl excluding .in files (treated in AC-OUTPUT below) and CVS -dnl directory - -mkdir -p bin/salome -cd bin/salome -for i in `find $ROOT_SRCDIR/bin` -do - local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR/bin,.,"` - case "$local_bin" in - *.in | *~) ;; - . | */CVS | */CVS/* | ./salome) ;; - ./appliskel |./appliskel/env.d) $INSTALL -d $local_bin ; echo $local_bin ;; - *) $INSTALL $i $local_bin; echo $local_bin ;; - esac -done -cd $ROOT_BUILDDIR - -AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript - -dnl copy xml files to the build tree (lib directory) -dnl pourquoi ???? - -#cd lib -#for i in `find $ROOT_SRCDIR -name "*.xml" -print` -#do -# ln -fs $i -# echo `echo $i | sed -e "s,$ROOT_SRCDIR,.,"` -#done -#cd $ROOT_BUILDDIR - -echo -echo --------------------------------------------- -echo generating Makefiles and configure files -echo --------------------------------------------- -echo - -AC_OUTPUT_COMMANDS([ \ - chmod +x ./bin/*; \ - chmod +x ./bin/salome/* \ -]) - -## do not delete this line - diff --git a/DEPRECATED/make_config.in b/DEPRECATED/make_config.in deleted file mode 100755 index 581b0ad41..000000000 --- a/DEPRECATED/make_config.in +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# make_config.in: template for make_config script -# make_config is used by check_cas.m4 to generate -# config.h file in case it cannot be found in OCC -# and SALOME include paths -#================================================= -# -dnl Process this file with autoconf to produce a configure script. - -AC_INIT(salome_adm/unix) -AC_CONFIG_SRCDIR(salome_adm/unix/config.h.in) -AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) -AC_CANONICAL_HOST - -AC_CONFIG_HEADERS(./salome_adm/unix/config.h) - -AC_ISC_POSIX -AC_C_BIGENDIAN - -dnl Checks for programs. -AC_PROG_CXX -AC_PROG_CC_C_O - -AC_PROG_AWK -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_YACC -AC_PROG_MAKE_SET - -dnl Replace `main' with a function in -le: -AC_CHECK_LIB(e, main) - -dnl Replace `main' with a function in -links: -AC_CHECK_LIB(inks, main) - -dnl Checks for X window system directories. -AC_PATH_X -if test "x$ac_x_includes" = "x"; then - X_INCLUDE="" -else - X_INCLUDE="-I$ac_x_includes" -fi -if test "x$ac_x_libraries" = "x"; then - X_LIBS="-lXt -lX11" -else - X_LIBS="-L$ac_x_libraries -lXt -lX11" -fi - -dnl Checks for header files. - -AC_HEADER_STDC -AC_LANG([C]) -AC_MSG_CHECKING([ for C header files ]) -AC_CHECK_HEADERS(dlfcn.h dl.h ieeefp.h time.h sys/time.h pwd.h) -AC_CHECK_HEADERS(sys/statvfs.h sys/vfs.h sys/param.h osfcn.h netdb.h) -AC_CHECK_HEADERS(sys/ioctl.h net/if.h sys/systeminfo.h sys/utsname.h) -AC_CHECK_HEADERS(sysent.h unistd.h sys/unistd.h sys/socket.h) -AC_CHECK_HEADERS(ndir.h sys/ndir.h sys/dir.h signal.h sys/signal.h) -AC_CHECK_HEADERS(sigfpe.h floatingpoint.h sys/machsig.h sys/siginfo.h) -AC_CHECK_HEADERS(malloc.h strings.h sys/stat.h sys/sem.h sys/ipc.h) -AC_CHECK_HEADERS(sys/times.h dirent.h getopt.h sys/vnode.h) - - -AC_LANG([C++]) -AC_MSG_CHECKING([ for C++ header files ]) -AC_CHECK_HEADERS(istream ostream istream fstream ios iomanip iostream ) -AC_CHECK_HEADERS(stream.h strstream.h istream.h ostream.h fstream.h stdlib.h ios.h iostream.h) -AC_CHECK_HEADERS(iomanip.h limits.h values.h float.h) -AC_CHECK_HEADERS(siginfo.h bits/sigset.h bstring.h sys/types.h sys/select.h) -AC_CHECK_HEADERS(X11/extensions/transovl.h X11/extensions/readdisplay.h) -AC_CHECK_HEADERS(X11/extensions/multibuf.h) -AC_CHECK_HEADERS(sys/filio.h sys/mman.h libc.h) - -dnl Checks for library functions. -AC_TYPE_SIGNAL - -AC_OUTPUT() diff --git a/salome_adm/CMakeLists.txt b/salome_adm/CMakeLists.txt index 3ab9c9aa5..40ea52835 100755 --- a/salome_adm/CMakeLists.txt +++ b/salome_adm/CMakeLists.txt @@ -18,7 +18,8 @@ # ADD_SUBDIRECTORY(unix) -ADD_SUBDIRECTORY(cmake_files) SALOME_CONFIGURE_FILE(SALOMEconfig.ref.in SALOMEconfig.h INSTALL ${SALOME_INSTALL_HEADERS}) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SALOMEconfig.ref.in DESTINATION ${SALOME_INSTALL_AMCONFIG} RENAME SALOMEconfig.h.in) \ No newline at end of file +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SALOMEconfig.ref.in DESTINATION ${SALOME_INSTALL_AMCONFIG} RENAME SALOMEconfig.h.in) + +SALOME_INSTALL_SCRIPTS(prepare_generating_doc.py ${SALOME_INSTALL_SCRIPT_SCRIPTS}) diff --git a/salome_adm/cmake_files/CMakeLists.txt b/salome_adm/cmake_files/CMakeLists.txt deleted file mode 100755 index 441cb9a48..000000000 --- a/salome_adm/cmake_files/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -SET(DATA - FindLibBatch.cmake - FindPaco.cmake - FindSalomeKERNEL.cmake - FindSalomeLibBatch.cmake - FindSalomePaco.cmake -) -INSTALL(FILES ${DATA} DESTINATION ${SALOME_INSTALL_CMAKE}) - -SALOME_INSTALL_SCRIPTS(prepare_generating_doc.py ${SALOME_INSTALL_SCRIPT_SCRIPTS}) diff --git a/salome_adm/cmake_files/FindLibBatch.cmake b/salome_adm/cmake_files/FindLibBatch.cmake deleted file mode 100644 index 3d66a8030..000000000 --- a/salome_adm/cmake_files/FindLibBatch.cmake +++ /dev/null @@ -1,54 +0,0 @@ -# - Find LibBatch installation -# -# The following variable are set: -# LIBBATCH_FOUND - TRUE if LibBatch installation has been found -# LIBBATCH_INCLUDE_DIRS - LibBatch headers path -# LIBBATCH_LIBRARIES - LibBatch libraries -# -# The CMake (or environment) variable LIBBATCH_ROOT_DIR can be set to -# guide the detection and indicate a root directory to look into. -# -############################################################################ -# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# ------ - -IF(NOT LIBBATCH_FIND_QUIETLY) - MESSAGE(STATUS "Check for LibBatch ...") -ENDIF() - -# ------ - -SET(LIBBATCH_ROOT_DIR $ENV{LIBBATCH_ROOT_DIR} CACHE PATH "Path to the LibBatch.") -IF(LIBBATCH_ROOT_DIR) - LIST(APPEND CMAKE_PREFIX_PATH "${LIBBATCH_ROOT_DIR}") -ENDIF() - -FIND_PATH(LIBBATCH_INCLUDE_DIRS libbatch/BatchManager.hxx) -FIND_LIBRARY(LIBBATCH_LIBRARIES NAMES batch) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibBatch REQUIRED_VARS LIBBATCH_INCLUDE_DIRS LIBBATCH_LIBRARIES) - -IF(LIBBATCH_FOUND) - IF(NOT LIBBATCH_FIND_QUIETLY) - MESSAGE(STATUS "LibBatch library: ${LIBBATCH_LIBRARIES}") - ENDIF() -ENDIF() diff --git a/salome_adm/cmake_files/FindPaco.cmake b/salome_adm/cmake_files/FindPaco.cmake deleted file mode 100644 index 28571c1f8..000000000 --- a/salome_adm/cmake_files/FindPaco.cmake +++ /dev/null @@ -1,70 +0,0 @@ -# - Find Paco installation -# -# Variables set are: -# PACO_INCLUDE_DIRS - include directories to add when compiling -# PACO_LIBRARIES - Paco libraries to link against -# -# You can set the environment or CMake variable PACO_ROOT_DIR to guide -# the detection mechanism. -# -############################################################# -# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# ------ - -IF(NOT Paco_FIND_QUIETLY) - MESSAGE(STATUS "Check for Paco ...") -ENDIF() - -# ------ - -SET(PACO_ROOT_DIR $ENV{PACO_ROOT_DIR} CACHE PATH "Path to Paco.") -IF(PACO_ROOT_DIR) - LIST(APPEND CMAKE_PREFIX_PATH "${PACO_ROOT_DIR}") -ENDIF(PACO_ROOT_DIR) - -FIND_PATH(PACO_INCLUDE_DIRS PaCO++_InterfaceManager_impl.h) - -FIND_LIBRARY(PACO_LIBRARY_PaCO PaCO) -FIND_LIBRARY(PACO_LIBRARY_GaBro GaBro) -FIND_LIBRARY(PACO_LIBRARY_BasicBC BasicBC) -FIND_LIBRARY(PACO_LIBRARY_PaCO_dummy PaCO_dummy) -FIND_LIBRARY(PACO_LIBRARY_PaCO_mpi PaCO_mpi) -FIND_LIBRARY(PACO_LIBRARY_PaCO_omnithread PaCO_omnithread) - -FIND_PROGRAM(PACO_IDL PaCOIdlTool.sh) - -MARK_AS_ADVANCED(PACO_INCLUDE_DIRS PACO_LIBRARY_PaCO PACO_LIBRARY_GaBro - PACO_LIBRARY_BasicBC PACO_LIBRARY_PaCO_dummy - PACO_LIBRARY_PaCO_mpi PACO_LIBRARY_PaCO_omnithread PACO_IDL) - -SET(PACO_LIBRARIES - ${PACO_LIBRARY_PaCO} - ${PACO_LIBRARY_GaBro} - ${PACO_LIBRARY_BasicBC} - ${PACO_LIBRARY_PaCO_dummy} - ${PACO_LIBRARY_PaCO_mpi} - ${PACO_LIBRARY_PaCO_omnithread}) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Paco - REQUIRED_VARS PACO_INCLUDE_DIRS PACO_LIBRARY_PaCO PACO_LIBRARY_GaBro - PACO_LIBRARY_BasicBC PACO_LIBRARY_PaCO_dummy - PACO_LIBRARY_PaCO_mpi PACO_LIBRARY_PaCO_omnithread PACO_IDL) diff --git a/salome_adm/cmake_files/FindSalomeKERNEL.cmake b/salome_adm/cmake_files/FindSalomeKERNEL.cmake deleted file mode 100644 index 0f951f33a..000000000 --- a/salome_adm/cmake_files/FindSalomeKERNEL.cmake +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# Author: Adrien Bruneton -# - -# KERNEL detection for salome - this is typically called by dependent modules -# (GUI, PARAVIS, etc ...) -# -# The detection is simpler than for other prerequisites. -# Indeed calling SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS() with SalomeKERNEL is tricky: -# - one would write SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(KERNEL xyz n) -# - then the macro would look first for a file named SalomeKERNELConfig.cmake (=the normal situation) -# - if not found (because KERNEL_ROOT_DIR was badly set for example) the macro would then look -# for a file named FindSalomeKERNEL.cmake -# => this is the current file, and that would trigger an infinite recursion ... :-) -# This could be detected with a flag mechanism, but honestly this becomes an overkill. -# -# So we go for a simple lookup, without conflict check: -# - -IF(NOT SalomeKERNEL_FIND_QUIETLY) - MESSAGE(STATUS "Looking for Salome KERNEL ...") -ENDIF() - -SET(CMAKE_PREFIX_PATH "${KERNEL_ROOT_DIR}") -SALOME_FIND_PACKAGE(SalomeKERNEL SalomeKERNEL CONFIG) - -IF(NOT SalomeKERNEL_FIND_QUIETLY) - MESSAGE(STATUS "Found Salome KERNEL: ${KERNEL_ROOT_DIR}") -ENDIF() - -FOREACH(_res ${SalomeKERNEL_EXTRA_ENV}) - SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeKERNEL_EXTRA_ENV_${_res}}") -ENDFOREACH() - -#---------------------------------------------------------------------------- -# KERNEL_WITH_CORBA is a macro useful for determining whether a KERNEL module -# builded in not light mode(with CORBA) -#---------------------------------------------------------------------------- -MACRO(KERNEL_WITH_CORBA) - IF(SALOME_KERNEL_LIGHT_ONLY) - MESSAGE(FATAL_ERROR "\nWe absolutely need a Salome KERNEL module with CORBA.\nPlease set option SALOME_LIGHT_ONLY to OFF when building KERNEL module.") - ENDIF() -ENDMACRO(KERNEL_WITH_CORBA) diff --git a/salome_adm/cmake_files/FindSalomeLibBatch.cmake b/salome_adm/cmake_files/FindSalomeLibBatch.cmake deleted file mode 100644 index 43155b2cc..000000000 --- a/salome_adm/cmake_files/FindSalomeLibBatch.cmake +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (C) 2013-2016 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# Author: Adrien Bruneton -# - -# LibBatch detection for Salome -# -# !! Please read the generic detection procedure in SalomeMacros.cmake !! -# - -SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(LibBatch LIBBATCH_INCLUDE_DIRS 1) -#MARK_AS_ADVANCED() - -IF(SALOMELIBBATCH_FOUND) - SALOME_ACCUMULATE_HEADERS(LIBBATCH_INCLUDE_DIRS) - SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${LIBBATCH_LIBRARIES}) -ENDIF() diff --git a/salome_adm/cmake_files/FindSalomePaco.cmake b/salome_adm/cmake_files/FindSalomePaco.cmake deleted file mode 100644 index 2a1505eb3..000000000 --- a/salome_adm/cmake_files/FindSalomePaco.cmake +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2013-2016 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# Author: Renaud Barate -# - -# Paco detection for SALOME -# -# !! Please read the generic detection procedure in SalomeMacros.cmake !! -# -SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Paco PACO_INCLUDE_DIRS 1) -#MARK_AS_ADVANCED() - -IF(SALOMEPACO_FOUND) - SALOME_ACCUMULATE_HEADERS(PACO_INCLUDE_DIRS) - SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${PACO_LIBRARIES}) -ENDIF() diff --git a/salome_adm/cmake_files/prepare_generating_doc.py b/salome_adm/prepare_generating_doc.py similarity index 100% rename from salome_adm/cmake_files/prepare_generating_doc.py rename to salome_adm/prepare_generating_doc.py -- 2.39.2