[poppler] 2 commits - CMakeLists.txt qt4/src

[Pino Toscano]

 CMakeLists.txt        |    4 ++--
 qt4/src/poppler-qt4.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5c300ce00b5c59da767ca1ffec12f96f0ebbe701
Author: Pino Toscano <pino at kde.org>
Date:   Sun Feb 21 21:20:10 2010 +0100

    [Qt4/apidox] fix typo

diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h
index f41e5e3..2f5521f 100644
--- a/qt4/src/poppler-qt4.h
+++ b/qt4/src/poppler-qt4.h
@@ -614,7 +614,7 @@ delete it;
    \subsection document-rendering-backend Backends
 
    %Poppler offers a different backends for rendering the pages. Currently
-   there two backends (see #RenderBackend), but only the Splash engine works
+   there are two backends (see #RenderBackend), but only the Splash engine works
    well and has been tested.
 
    The available rendering backends can be discovered via availableRenderBackends().
commit 3f89ccf871e2f4a14129ad3e986b8cd19cdf129c
Author: Pino Toscano <pino at kde.org>
Date:   Sun Feb 21 21:06:31 2010 +0100

    [CMake] set the CXXFLAGS in a better way

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2f45a5..329a6de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,10 +146,10 @@ else(DEFINED COMPILE_WARNINGS)
 endif(DEFINED COMPILE_WARNINGS)
 string(TOLOWER "${COMPILE_WARNINGS}" _comp_warnings)
 if(_comp_warnings STREQUAL "no")
-  add_definitions(${DEFAULT_COMPILE_WARNINGS_NO})
+  set(CMAKE_CXX_FLAGS "${DEFAULT_COMPILE_WARNINGS_NO} ${CMAKE_CXX_FLAGS}")
 endif(_comp_warnings STREQUAL "no")
 if(_comp_warnings STREQUAL "yes")
-  add_definitions(${DEFAULT_COMPILE_WARNINGS_YES})
+  set(CMAKE_CXX_FLAGS "${DEFAULT_COMPILE_WARNINGS_YES} ${CMAKE_CXX_FLAGS}")
 endif(_comp_warnings STREQUAL "yes")
 if(_comp_warnings STREQUAL "kde")
   set(CMAKE_CXX_FLAGS "${DEFAULT_COMPILE_WARNINGS_KDE} ${CMAKE_CXX_FLAGS}")