From: vsr Date: Wed, 14 Oct 2015 07:32:24 +0000 (+0300) Subject: Fix problem of build with -DSALOME_MED_STANDALONE=ON option X-Git-Tag: V7_7_0_WIN~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b2eef6ed12cfd42f376fca2c49095358e7497dd8;p=modules%2Fmed.git Fix problem of build with -DSALOME_MED_STANDALONE=ON option --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 51a6514c3..eebd5ae32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,15 +182,6 @@ IF(SALOME_MED_ENABLE_RENUMBER) SALOME_LOG_OPTIONAL_PACKAGE(Boost SALOME_MED_ENABLE_RENUMBER) ENDIF(SALOME_MED_ENABLE_RENUMBER) -IF(SALOME_BUILD_DOC) - FIND_PACKAGE(SalomeDoxygen) - FIND_PACKAGE(SalomeGraphviz) - FIND_PACKAGE(SalomeSphinx) - SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC) - SALOME_LOG_OPTIONAL_PACKAGE(Graphviz SALOME_BUILD_DOC) - SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC) -ENDIF(SALOME_BUILD_DOC) - IF(SALOME_MED_ENABLE_PYTHON) FIND_PACKAGE(SalomePython) FIND_PACKAGE(SalomeSWIG) @@ -209,6 +200,15 @@ IF(SALOME_MED_ENABLE_PYTHON) ENDIF(SCIPY_FOUND) ENDIF(SALOME_MED_ENABLE_PYTHON) +IF(SALOME_BUILD_DOC) + FIND_PACKAGE(SalomeDoxygen) + FIND_PACKAGE(SalomeGraphviz) + FIND_PACKAGE(SalomeSphinx) + SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC) + SALOME_LOG_OPTIONAL_PACKAGE(Graphviz SALOME_BUILD_DOC) + SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC) +ENDIF(SALOME_BUILD_DOC) + # Detection report SALOME_PACKAGE_REPORT_AND_CHECK()