From 88d300bcfab3bd6578c216dcc96a1f0e82ac970a Mon Sep 17 00:00:00 2001 From: rnv Date: Wed, 16 Dec 2015 19:30:47 +0300 Subject: [PATCH] Fix a problem with detecting python. --- CMakeLists.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 51725d58f..7c9609047 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) -- 2.39.2