MERGE stage 1: keep doc/dev and src/MEDCalc/doc

[modules/med.git] / src / MEDCalculator / CMakeLists.txt

diff --git a/src/MEDCalculator/CMakeLists.txt b/src/MEDCalculator/CMakeLists.txt
index 958982e4513c6101d717314d44f90e09a83b1297..e36cb5325ebfbb36b20e1b2c8a5b245bdca0d43b 100644 (file)
--- a/src/MEDCalculator/CMakeLists.txt
+++ b/src/MEDCalculator/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2015  CEA/DEN, 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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# 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
@@ -22,12 +22,11 @@ ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${OMNIORB_DEFINITIONS
 
 IF(SALOME_MED_ENABLE_PYTHON)
   ADD_SUBDIRECTORY(Swig)
+  IF(SALOME_BUILD_TESTS)
+    ADD_SUBDIRECTORY(Test)
+  ENDIF(SALOME_BUILD_TESTS)
 ENDIF(SALOME_MED_ENABLE_PYTHON)
 
-IF(SALOME_BUILD_TESTS)
-  ADD_SUBDIRECTORY(Test)
-ENDIF(SALOME_BUILD_TESTS)
-
 INCLUDE_DIRECTORIES(
   ${MEDFILE_INCLUDE_DIRS}
   ${HDF5_INCLUDE_DIRS}