From 8f533767b8a6a38f191e3017a12c2e31ae6d1a1d Mon Sep 17 00:00:00 2001 From: mpa Date: Thu, 17 Jul 2014 11:09:56 +0400 Subject: [PATCH] Some bugs were fixed in CMake and Sphinx --- doc/cppsalome.rst | 2 +- src/engine/Proc.cxx | 2 +- src/pmml/CMakeLists.txt | 9 -------- src/pmml/doc/doxygen/Doxyfile_pmml_user.in | 24 +++++++++++----------- 4 files changed, 14 insertions(+), 23 deletions(-) diff --git a/doc/cppsalome.rst b/doc/cppsalome.rst index 91cca5922..f6c1bb9df 100644 --- a/doc/cppsalome.rst +++ b/doc/cppsalome.rst @@ -165,7 +165,7 @@ hello, goodbye and copyOrMove are given in the source file (HELLO.cxx):: } CMakeLists.txt --------- +-------------- Create and add library to the project:: # --- options --- diff --git a/src/engine/Proc.cxx b/src/engine/Proc.cxx index 101f7aafe..46185cc7f 100644 --- a/src/engine/Proc.cxx +++ b/src/engine/Proc.cxx @@ -487,7 +487,7 @@ Container* Proc::createContainer(const std::string& name,const std::string& kind * * \param inst: the component instance * \param name: the component instance name - * \param restCtr: try to reuse instance number previously released, false by default + * \param resetCtr: try to reuse instance number previously released, false by default */ void Proc::addComponentInstance(ComponentInstance* inst, const std::string& name, bool resetCtr) { diff --git a/src/pmml/CMakeLists.txt b/src/pmml/CMakeLists.txt index 9c989a45c..a6709da84 100755 --- a/src/pmml/CMakeLists.txt +++ b/src/pmml/CMakeLists.txt @@ -43,15 +43,6 @@ IF(URANIE AND WIN32) ENABLE_TESTING() ENDIF(URANIE AND WIN32) -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_YACS_USE_SWIG) FIND_PACKAGE(SalomePython) FIND_PACKAGE(SalomeSWIG) diff --git a/src/pmml/doc/doxygen/Doxyfile_pmml_user.in b/src/pmml/doc/doxygen/Doxyfile_pmml_user.in index c021edd79..1a1a8d880 100755 --- a/src/pmml/doc/doxygen/Doxyfile_pmml_user.in +++ b/src/pmml/doc/doxygen/Doxyfile_pmml_user.in @@ -70,21 +70,21 @@ WARN_LOGFILE = log_user # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = @srcdir@/doxfiles/intro.dox \ - @srcdir@/doxfiles/cppexamples.dox \ - @srcdir@/doxfiles/pyexamples.dox \ - @srcdir@/doxfiles/pmml.dox \ - @srcdir@/doxfiles/install.dox \ - @srcdir@/../../src/PMML +INPUT = @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/intro.dox \ + @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/cppexamples.dox \ + @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/pyexamples.dox \ + @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/pmml.dox \ + @CMAKE_CURRENT_SOURCE_DIR@/doxfiles/install.dox \ + @CMAKE_SOURCE_DIR@/src/pmml FILE_PATTERNS = PMMLlib.* \ *.dox RECURSIVE = YES EXCLUDE = CVS EXCLUDE_PATTERNS = *~ -EXAMPLE_PATH = @srcdir@/../../src/PMML \ - @srcdir@/../../src/PMML/Test \ - @srcdir@/../../src/PMML_Swig +EXAMPLE_PATH = @CMAKE_SOURCE_DIR@/src/pmml \ + @CMAKE_SOURCE_DIR@/src/pmml/Test \ + @CMAKE_SOURCE_DIR@/src/pmml/pmml_Swig EXAMPLE_PATTERNS = *.cxx *.py EXAMPLE_RECURSIVE = NO @@ -109,9 +109,9 @@ IGNORE_PREFIX = #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = html -HTML_HEADER = @builddir@/static/header.html -HTML_FOOTER = @srcdir@/static/footer.html -HTML_EXTRA_STYLESHEET = @srcdir@/static/salome_extra.css +HTML_HEADER = @CMAKE_CURRENT_BINARY_DIR@/static/header.html +HTML_FOOTER = @CMAKE_CURRENT_SOURCE_DIR@/static/footer.html +HTML_EXTRA_STYLESHEET = @CMAKE_CURRENT_SOURCE_DIR@/static/salome_extra.css GENERATE_HTMLHELP = NO GENERATE_CHI = YES BINARY_TOC = NO -- 2.30.2