]> SALOME platform Git repositories - modules/med.git/commitdiff
Salome HOME
Fix a problem with detecting python.
authorrnv <rnv@opencascade.com>
Wed, 16 Dec 2015 16:30:47 +0000 (19:30 +0300)
committerrnv <rnv@opencascade.com>
Wed, 16 Dec 2015 16:30:47 +0000 (19:30 +0300)
CMakeLists.txt

index 51725d58f532fcf15b5d170480c0f890408e37bc..7c960904736f445338628e7157c6733da96c6358 100644 (file)
@@ -108,17 +108,6 @@ IF(SALOME_BUILD_GUI)
     FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
 ENDIF(SALOME_BUILD_GUI)
 
-IF(SALOME_BUILD_TESTS)
-  ENABLE_TESTING()
-  FIND_PACKAGE(SalomeCppUnit)
-  SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)
-ENDIF(SALOME_BUILD_TESTS)
-
-IF(SALOME_USE_MPI)
-  FIND_PACKAGE(SalomeMPI REQUIRED)
-  ADD_DEFINITIONS("-DHAVE_MPI")
-ENDIF(SALOME_USE_MPI)
-
 IF(SALOME_MED_ENABLE_PYTHON)
   FIND_PACKAGE(SalomePython)
   FIND_PACKAGE(SalomeSWIG)
@@ -135,6 +124,17 @@ IF(SALOME_MED_ENABLE_PYTHON)
   ENDIF(SCIPY_FOUND)
 ENDIF(SALOME_MED_ENABLE_PYTHON)
 
+IF(SALOME_BUILD_TESTS)
+  ENABLE_TESTING()
+  FIND_PACKAGE(SalomeCppUnit)
+  SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)
+ENDIF(SALOME_BUILD_TESTS)
+
+IF(SALOME_USE_MPI)
+  FIND_PACKAGE(SalomeMPI REQUIRED)
+  ADD_DEFINITIONS("-DHAVE_MPI")
+ENDIF(SALOME_USE_MPI)
+
 IF(SALOME_BUILD_DOC)
   FIND_PACKAGE(SalomeDoxygen)
   FIND_PACKAGE(SalomeGraphviz)