From: Gerald NICOLAS <D68518@dsp0677846.(none)>
Date: Thu, 14 Jan 2016 12:33:20 +0000 (+0100)
Subject: Déplacement de l'instruction de création des tests
X-Git-Tag: V8_0_0a2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e50bf37eeb7e4f8e83f53ff22a806832fd276b66;p=modules%2Fhomard.git

Déplacement de l'instruction de création des tests
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28003189..ce776724 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,13 +80,18 @@ ENDIF(WIN32)
 OPTION(SALOME_BUILD_DOC "Generate SALOME HOMARD documentation" ON)
 OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
 
-# For salome test
-# ============
+
+# Other KERNEL optionals: 
 IF(SALOME_BUILD_TESTS)
   ENABLE_TESTING()
   FIND_PACKAGE(SalomeCppUnit)
   SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)
 ENDIF()
+IF(SALOME_BUILD_DOC)
+  FIND_PACKAGE(SalomeSphinx)
+  SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)
+ENDIF()
+
 
 ##
 ## From KERNEL:
@@ -102,12 +107,6 @@ FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
 # HDF5
 FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C)
 
-# Other KERNEL optionals:
-IF(SALOME_BUILD_DOC)
-  FIND_PACKAGE(SalomeSphinx)
-  SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)
-ENDIF()
-
 
 ##
 ## From GUI:
@@ -217,8 +216,8 @@ ADD_SUBDIRECTORY(resources)
 ADD_SUBDIRECTORY(src)
 IF(SALOME_BUILD_DOC)
   ADD_SUBDIRECTORY(doc)
+ENDIF()
 ADD_SUBDIRECTORY(bin)
-ENDIF(SALOME_BUILD_DOC)
 
 # Header configuration
 # ====================
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aad68b6e..1226a565 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,14 +32,8 @@ SET(SUBDIRS
   ${SUBDIRS_COMMON}
 )
 
-# For salome test
-IF(SALOME_BUILD_TESTS)
-  INSTALL(FILES CTestTestfileInstall.cmake
-          DESTINATION ${SALOME_HOMARD_INSTALL_TEST}
-          RENAME CTestTestfile.cmake)
-ENDIF(SALOME_BUILD_TESTS)
-
 FOREACH(dir ${SUBDIRS})
- ADD_SUBDIRECTORY(${dir})
+  ADD_SUBDIRECTORY(${dir})
 ENDFOREACH(dir ${SUBDIRS})
 
+