From 39002ec0a6989ae71c64affb4cb7f90000d9e52e Mon Sep 17 00:00:00 2001 From: Florian BRUNET Date: Thu, 28 May 2015 18:06:35 +0200 Subject: [PATCH] Maj des CMakeLists.txt pour compiler tous les fichiers python du dossier InterfaceQT4. --- CMakeLists.txt | 2 +- InterfaceQT4/CMakeLists.txt | 69 -------------------- Openturns_Study/prefs_OPENTURNS_STUDY.py | 2 +- Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py | 2 +- 4 files changed, 3 insertions(+), 72 deletions(-) delete mode 100644 InterfaceQT4/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index bed3fb8b..bfc50dc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,7 +152,7 @@ add_subdirectory ( Aide ) add_subdirectory ( Editeur ) add_subdirectory ( Extensions ) add_subdirectory ( Ihm ) -add_subdirectory ( InterfaceQT4 ) +install ( DIRECTORY InterfaceQT4 DESTINATION ${CMAKE_INSTALL_PREFIX} ) add_subdirectory ( Noyau ) add_subdirectory ( UiQT4 ) add_subdirectory ( Validation ) diff --git a/InterfaceQT4/CMakeLists.txt b/InterfaceQT4/CMakeLists.txt deleted file mode 100644 index 0dfcfb70..00000000 --- a/InterfaceQT4/CMakeLists.txt +++ /dev/null @@ -1,69 +0,0 @@ -# -*- coding: utf-8 -*- -# CONFIGURATION MANAGEMENT OF EDF VERSION -# ====================================================================== -# COPYRIGHT (C) 1991 - 2002, 2013 EDF R&D WWW.CODE-ASTER.ORG -# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY -# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY -# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR -# (AT YOUR OPTION) ANY LATER VERSION. -# -# THIS PROGRAM 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 -# GENERAL PUBLIC LICENSE FOR MORE DETAILS. -# -# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE -# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER, -# 1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE. -# -# -# ====================================================================== - -# Installation de tous les fichiers Python du repertoire et des sous-repertoires (sauf CVS) -install ( FILES browser.py compobloc.py compocommandecomm.py compocomm.py - compoerror.py compofact.py compoformule.py compojdc.py compomacro.py - compomclist.py componiveau.py componuplet.py compooper.py compoparam.py - compoproc.py composimp.py editor.py eficas_go.py - __init__.py monChoixCata.py monChoixCode.py monCommandePanel.py - monCommentairePanel.py monFonctionPanel.py monFormulePanel.py - monInactifPanel.py monIncludePanel.py monListeParamPanel.py - monMacroPanel.py monMatricePanel.py monMCFactPanel.py - monMCListAjoutPanel.py monOptionsPdf.py monParamPanel.py monPixmap.py - monPlusieursASSDPanel.py monPlusieursBasePanel.py monPlusieursIntoPanel.py - monPoursuitePanel.py monRacinePanel.py monSelectVal.py - monUniqueASSDPanel.py monUniqueBasePanel.py monUniqueBoolPanel.py - monUniqueCompPanel.py monUniqueIntoPanel.py - monUniqueSDCOIntoPanel.py monUniqueSDCOPanel.py monVisu.py - politiquesValidation.py qtCommun.py qtEficas.py - qtSaisie.py readercata.py typeNode.py utilIcons.py viewManager.py - configuration.py monSelectImage.py - monRecherche.py getVersion.py monBoutonSalome.py - DESTINATION ${CMAKE_INSTALL_PREFIX}/InterfaceQT4 - ) - -# Installation des fichiers : OpenTURNS -if (WITH_OPENTURNS) - install ( FILES monOptions_OPENTURNS_STUDY.py monOptions_OPENTURNS_WRAPPER.py - DESTINATION ${CMAKE_INSTALL_PREFIX}/InterfaceQT4 - ) -endif (WITH_OPENTURNS) - -# Installation des fichiers : Aster -if (WITH_ASTER) - install ( FILES gereTraduction.py monOptions_ASTER.py ssIhm.py - DESTINATION ${CMAKE_INSTALL_PREFIX}/InterfaceQT4 - ) -endif (WITH_ASTER) - -# Installation des fichiers : MAP -if (WITH_MAP) - install ( FILES monOptions_MAP.py - DESTINATION ${CMAKE_INSTALL_PREFIX}/InterfaceQT4 - ) -endif (WITH_MAP) - -#monOptions_CUVE2DG.py - -### Local Variables: -### mode: cmake -### End: diff --git a/Openturns_Study/prefs_OPENTURNS_STUDY.py b/Openturns_Study/prefs_OPENTURNS_STUDY.py index b2dfe99b..f6821cfa 100644 --- a/Openturns_Study/prefs_OPENTURNS_STUDY.py +++ b/Openturns_Study/prefs_OPENTURNS_STUDY.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py b/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py index 10c02a47..f2ccfacd 100644 --- a/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py +++ b/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2007-2013 EDF R&D +# Copyright (C) 2007-2012 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public -- 2.39.2