From 9111c4cce28c4af3149e3b2494703ebaac04898d Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 9 Jan 2011 18:57:52 +0000 Subject: [PATCH] Display the names of parsed file only if they are found. Unstall UseLATEX cmake macro. --- crlcore/cmake_modules/CMakeLists.txt | 1 + crlcore/src/ccore/Environment.cpp | 2 -- crlcore/src/ccore/XmlParser.cpp | 19 ++++++++----------- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/crlcore/cmake_modules/CMakeLists.txt b/crlcore/cmake_modules/CMakeLists.txt index d5e3deea..58fae2fc 100644 --- a/crlcore/cmake_modules/CMakeLists.txt +++ b/crlcore/cmake_modules/CMakeLists.txt @@ -1,3 +1,4 @@ install ( FILES FindCORIOLIS.cmake FindOPENACCESS.cmake + UseLATEX.cmake DESTINATION share/cmake/Modules ) diff --git a/crlcore/src/ccore/Environment.cpp b/crlcore/src/ccore/Environment.cpp index a7b41e52..c7d725b7 100644 --- a/crlcore/src/ccore/Environment.cpp +++ b/crlcore/src/ccore/Environment.cpp @@ -210,8 +210,6 @@ namespace { envPath = env.getCORIOLIS_TOP() + "/" + sysConfDir + "/coriolis2/environment.alliance.xml" ; } - cmess1 << " - <" << envPath << ">." << endl; - return ep._load ( envPath, warnNotFound ); } diff --git a/crlcore/src/ccore/XmlParser.cpp b/crlcore/src/ccore/XmlParser.cpp index c272cc6d..285837ee 100644 --- a/crlcore/src/ccore/XmlParser.cpp +++ b/crlcore/src/ccore/XmlParser.cpp @@ -1,17 +1,12 @@ // -*- C++ -*- - -# include -# include - -# include - -# include - -# include "crlcore/XmlParser.h" - - +#include +#include +#include +#include +#include "crlcore/Utilities.h" +#include "crlcore/XmlParser.h" namespace CRL { @@ -40,6 +35,8 @@ namespace CRL { return false; } + cmess1 << " - <" << path << ">." << endl; + QXmlStreamReader reader ( &file ); _reader = &reader;