Suppression des conditions par rapport aux options - Issue 8972

diff --git a/InterfaceQT4/CMakeLists.txt b/InterfaceQT4/CMakeLists.txt
index baab3594e3fd8b51ec72cdcfc7e3377666e5442e..c8cd87076b254e3b4cbe850f2b7a061cc4195cce 100644 (file)
--- a/InterfaceQT4/CMakeLists.txt
+++ b/InterfaceQT4/CMakeLists.txt
@@ -42,25 +42,19 @@ install ( FILES browser.py compobase.py compobloc.py compocommandecomm.py compoc
         )
 
 # 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)
+install ( FILES monOptions_OPENTURNS_STUDY.py monOptions_OPENTURNS_WRAPPER.py
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/InterfaceQT4
+        )
 
 # Installation des fichiers : Aster
-if (WITH_ASTER)
-  install ( FILES gereTraduction.py monOptions_ASTER.py ssIhm.py
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/InterfaceQT4
-          )
-endif (WITH_ASTER)
+install ( FILES gereTraduction.py monOptions_ASTER.py ssIhm.py
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/InterfaceQT4
+        )
 
 # Installation des fichiers : MAP
-if (WITH_MAP)
-  install ( FILES monOptions_MAP.py
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/InterfaceQT4
-          )
-endif (WITH_MAP)
+install ( FILES monOptions_MAP.py
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/InterfaceQT4
+        )
 
 #monOptions_CUVE2DG.py
 

diff --git a/convert/CMakeLists.txt b/convert/CMakeLists.txt
index 2ce0bfc50a58c9c282c8bfcfda855697f90f541f..da41a3ba4b0c3609d5116a5067e88bd6360afdd7 100644 (file)
--- a/convert/CMakeLists.txt
+++ b/convert/CMakeLists.txt
@@ -25,37 +25,29 @@ install ( FILES __init__.py parseur_python.py convert_python.py
         )
 
 # Installation des fichiers : Open TURNS
-if (WITH_OPENTURNS)
-  install ( FILES convert_openturns_study.py convert_openturns_wrapper.py
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/convert
-          )
-endif (WITH_OPENTURNS)
+install ( FILES convert_openturns_study.py convert_openturns_wrapper.py
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/convert
+        )
 
 # Installation des fichiers : Aster
-if (WITH_ASTER)
-  install ( FILES convert_asterv5.py
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/convert
-          )
-  install ( DIRECTORY Parserv5
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/convert
-           FILES_MATCHING PATTERN *.py PATTERN *.tag PATTERN README
-            PATTERN CVS EXCLUDE
-          )
-endif (WITH_ASTER)
+install ( FILES convert_asterv5.py
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/convert
+        )
+install ( DIRECTORY Parserv5
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/convert
+   FILES_MATCHING PATTERN *.py PATTERN *.tag PATTERN README
+          PATTERN CVS EXCLUDE
+        )
 
 # Installation des fichiers : MAP
-if (WITH_MAP)
-  install ( FILES convert_map.py
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/convert
-          )
-endif (WITH_MAP)
+install ( FILES convert_map.py
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/convert
+        )
 
 # Installation des fichiers : SEP
-if (WITH_SEP)
-  install ( FILES convert_SEP.py
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/convert
-          )
-endif (WITH_SEP)
+install ( FILES convert_SEP.py
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/convert
+        )
 
 ### Local Variables:
 ### mode: cmake

diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index 708741bb896ddb4c8ffa5b1de535bf0b337a9d04..bcbf784ae663d2f6c9188b80d3421b2f711080a4 100644 (file)
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -25,48 +25,36 @@ install ( FILES __init__.py generator_python.py Formatage.py generator_aplat.py
         )
 
 # Installation des fichiers : Open TURNS
-if (WITH_OPENTURNS)
-  install ( FILES generator_openturns.py generator_openturns_study.py generator_openturns_wrapper.py
-                  OpenturnsBase.py OpenturnsSTD.py OpenturnsXML.py
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/generator
-          )
-endif (WITH_OPENTURNS)
+install ( FILES generator_openturns.py generator_openturns_study.py generator_openturns_wrapper.py
+                OpenturnsBase.py OpenturnsSTD.py OpenturnsXML.py
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/generator
+        )
 
 # Installation des fichiers : Aster
-if (WITH_ASTER)
-  install ( FILES generator_asterv5.py generator_GroupMA.py generator_vers3DSalome.py 
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/generator
-          )
-endif (WITH_ASTER)
+install ( FILES generator_GroupMA.py generator_vers3DSalome.py 
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/generator
+        )
 
 # Installation des fichiers : ZCRACKS
-if (WITH_ASTER)
-  install ( FILES generator_ZCracks.py
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/generator
-          )
-endif (WITH_ASTER)
+install ( FILES generator_ZCracks.py
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/generator
+        )
 
 # Installation des fichiers : MAP
-if (WITH_MAP)
-  install ( FILES generator_map.py
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/generator
-          )
-endif (WITH_MAP)
+install ( FILES generator_map.py
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/generator
+        )
 
 # Installation des fichiers : CARMEL
-if (WITH_CARMEL)
-  install ( FILES generator_CARMEL3D_frequentiel.py generator_CARMELCND.py
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/generator
-          )
-endif (WITH_CARMEL)
+install ( FILES generator_CARMEL3D_frequentiel.py generator_CARMELCND.py
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/generator
+        )
 
 
 # Installation des fichiers : SEP
-if (WITH_SEP)
-  install ( FILES generator_SEP.py tube.py
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/generator
-          )
-endif (WITH_SEP)
+install ( FILES generator_SEP.py tube.py
+          DESTINATION ${CMAKE_INSTALL_PREFIX}/generator
+        )
 
 
 ### Local Variables: