From d449b785292682b83e3448be0c2d9194c13e61c5 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 12 Feb 2019 17:47:39 +0300 Subject: [PATCH] Remove deprecated staff --- CMakeLists.txt | 18 ++----- SalomeATOMSOLVConfig.cmake.in | 4 -- adm_local/CMakeLists.txt | 21 -------- adm_local/unix/CMakeLists.txt | 20 ------- adm_local/unix/config_files/CMakeLists.txt | 24 --------- adm_local/unix/config_files/check_ATOMSOLV.m4 | 53 ------------------- bin/CMakeLists.txt | 2 +- .../cmake_files => cmake}/CMakeLists.txt | 0 .../FindSalomeATOMSOLV.cmake | 0 9 files changed, 5 insertions(+), 137 deletions(-) delete mode 100755 adm_local/CMakeLists.txt delete mode 100755 adm_local/unix/CMakeLists.txt delete mode 100755 adm_local/unix/config_files/CMakeLists.txt delete mode 100755 adm_local/unix/config_files/check_ATOMSOLV.m4 rename {adm_local/cmake_files => cmake}/CMakeLists.txt (100%) rename {adm_local/cmake_files => cmake}/FindSalomeATOMSOLV.cmake (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d9e1004..672ad63 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,7 @@ INCLUDE(SalomeSetupPlatform) # From KERNEL # Always build libraries as shared objects: SET(BUILD_SHARED_LIBS TRUE) # Local macros: -LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files") +LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") # User options # ============ @@ -134,17 +134,9 @@ SET(SALOME_INSTALL_SCRIPT_DATA "${SALOME_INSTALL_SCRIPT_DATA}" CACHE PATH "Install path: SALOME script data") SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH "Install path: SALOME Python scripts") -SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "${SALOME_INSTALL_APPLISKEL_SCRIPTS}" CACHE PATH - "Install path: SALOME application skeleton - scripts") -SET(SALOME_INSTALL_APPLISKEL_PYTHON "${SALOME_INSTALL_APPLISKEL_PYTHON}" CACHE PATH - "Install path: SALOME application skeleton - Python") SET(SALOME_INSTALL_PYTHON "${SALOME_INSTALL_PYTHON}" CACHE PATH "Install path: SALOME Python stuff") -SET(SALOME_INSTALL_PYTHON_SHARED "${SALOME_INSTALL_PYTHON_SHARED}" CACHE PATH - "Install path: SALOME Python shared modules") SET(SALOME_INSTALL_CMAKE_LOCAL "${SALOME_INSTALL_CMAKE_LOCAL}" CACHE PATH "Install path: local SALOME CMake files") -SET(SALOME_INSTALL_AMCONFIG_LOCAL "${SALOME_INSTALL_AMCONFIG_LOCAL}" CACHE PATH - "Install path: local SALOME config files (obsolete, to be removed)") SET(SALOME_INSTALL_RES "${SALOME_INSTALL_RES}" CACHE PATH "Install path: SALOME resources") SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME documentation") @@ -154,10 +146,8 @@ SET(SALOME_ATOMSOLV_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/atomsolv" CACHE PATH MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SALOME_INSTALL_HEADERS) MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_SCRIPTS SALOME_INSTALL_SCRIPT_DATA SALOME_INSTALL_SCRIPT_PYTHON) -MARK_AS_ADVANCED(SALOME_INSTALL_APPLISKEL_SCRIPTS SALOME_INSTALL_APPLISKEL_PYTHON SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES) -MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED) -MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC) -MARK_AS_ADVANCED(SALOME_ATOMSOLV_INSTALL_RES_DATA) +MARK_AS_ADVANCED(SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES SALOME_INSTALL_PYTHON) +MARK_AS_ADVANCED(SALOME_INSTALL_DOC SALOME_ATOMSOLV_INSTALL_RES_DATA) # Accumulate environment variables for ATOMSOLV module SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS} @@ -167,7 +157,7 @@ SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${ # Sources # ======== ADD_SUBDIRECTORY(idl) -ADD_SUBDIRECTORY(adm_local) +ADD_SUBDIRECTORY(cmake) ADD_SUBDIRECTORY(resources) ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(bin) diff --git a/SalomeATOMSOLVConfig.cmake.in b/SalomeATOMSOLVConfig.cmake.in index 93bba62..5976670 100644 --- a/SalomeATOMSOLVConfig.cmake.in +++ b/SalomeATOMSOLVConfig.cmake.in @@ -93,14 +93,10 @@ SET(SALOME_INSTALL_HEADERS "@SALOME_INSTALL_HEADERS@") SET(SALOME_INSTALL_SCRIPT_SCRIPTS "@SALOME_INSTALL_SCRIPT_SCRIPTS@") SET(SALOME_INSTALL_SCRIPT_DATA "@SALOME_INSTALL_SCRIPT_DATA@") SET(SALOME_INSTALL_SCRIPT_PYTHON "@SALOME_INSTALL_SCRIPT_PYTHON@") -SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "@SALOME_INSTALL_APPLISKEL_SCRIPTS@") -SET(SALOME_INSTALL_APPLISKEL_PYTHON "@SALOME_INSTALL_APPLISKEL_PYTHON@") SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@") SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@") -SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@") SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@") SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@") -SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@") # Include ATOMGEN targets if they were not already loaded: IF(NOT (TARGET SalomeIDLATOMGEN)) diff --git a/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt deleted file mode 100755 index 077782b..0000000 --- a/adm_local/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2013-2019 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 -# - -ADD_SUBDIRECTORY(unix) -ADD_SUBDIRECTORY(cmake_files) diff --git a/adm_local/unix/CMakeLists.txt b/adm_local/unix/CMakeLists.txt deleted file mode 100755 index 118075d..0000000 --- a/adm_local/unix/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2013-2019 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 -# - -ADD_SUBDIRECTORY(config_files) diff --git a/adm_local/unix/config_files/CMakeLists.txt b/adm_local/unix/config_files/CMakeLists.txt deleted file mode 100755 index 749c51b..0000000 --- a/adm_local/unix/config_files/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2013-2019 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(_m4_data - check_ATOMSOLV.m4 -) - -INSTALL(FILES ${_m4_data} DESTINATION ${SALOME_INSTALL_AMCONFIG_LOCAL}/config_files) diff --git a/adm_local/unix/config_files/check_ATOMSOLV.m4 b/adm_local/unix/config_files/check_ATOMSOLV.m4 deleted file mode 100755 index 7cc6c6f..0000000 --- a/adm_local/unix/config_files/check_ATOMSOLV.m4 +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright (C) 2007-2019 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 -# - -AC_DEFUN([CHECK_ATOMSOLV],[ - -AC_CHECKING(for ATOMSOLV) - -ATOMSOLV_ok=no - -AC_ARG_WITH(atomic, - [ --with-atomic=DIR root directory path of ATOMSOLV module installation ], - ATOMSOLV_DIR="$withval",ATOMSOLV_DIR="") - -if test "x$ATOMSOLV_DIR" == "x" ; then - # no --with-atomic-dir option used - if test "x$ATOMSOLV_ROOT_DIR" != "x" ; then - # ATOMSOLV_ROOT_DIR environment variable defined - ATOMSOLV_DIR=$ATOMSOLV_ROOT_DIR - fi -fi - -if test -f ${ATOMSOLV_DIR}/lib/salome/libATOMSOLV.so ; then - ATOMSOLV_ok=yes - AC_MSG_RESULT(Using ATOMSOLV module distribution in ${ATOMSOLV_DIR}) - - if test "x$ATOMSOLV_ROOT_DIR" == "x" ; then - ATOMSOLV_ROOT_DIR=${ATOMSOLV_DIR} - fi - AC_SUBST(ATOMSOLV_ROOT_DIR) -else - AC_MSG_WARN("Cannot find ATOMSOLV module sources") -fi - -AC_MSG_RESULT(for ATOMSOLV: $ATOMSOLV_ok) - -])dnl - diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index 211e1e0..e42abf6 100755 --- a/bin/CMakeLists.txt +++ b/bin/CMakeLists.txt @@ -18,7 +18,7 @@ # SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) -SALOME_CONFIGURE_FILE(runATOMSOLV.in runATOMSOLV INSTALL ${SALOME_INSTALL_BINS}) +SALOME_CONFIGURE_FILE(runATOMSOLV.in runATOMSOLV INSTALL ${SALOME_INSTALL_BINS} EXEC_PERMS) # =============================================================== # Files to be installed diff --git a/adm_local/cmake_files/CMakeLists.txt b/cmake/CMakeLists.txt similarity index 100% rename from adm_local/cmake_files/CMakeLists.txt rename to cmake/CMakeLists.txt diff --git a/adm_local/cmake_files/FindSalomeATOMSOLV.cmake b/cmake/FindSalomeATOMSOLV.cmake similarity index 100% rename from adm_local/cmake_files/FindSalomeATOMSOLV.cmake rename to cmake/FindSalomeATOMSOLV.cmake -- 2.39.2