chewing-editor/trunk/system-gtest.patch

   1 diff --git a/CMakeLists.txt b/CMakeLists.txt
   2 index 876da06..d3cf4e1 100644
   3 --- a/CMakeLists.txt
   4 +++ b/CMakeLists.txt
   5 @@ -99,7 +99,6 @@ install(
   6
   7  include_directories(
   8      ${PROJECT_BINARY_DIR}/include
   9 -    ${PROJECT_SOURCE_DIR}/gmock/gtest/include
  10      ${PROJECT_SOURCE_DIR}/src/exporter
  11      ${PROJECT_SOURCE_DIR}/src/importer
  12      ${PROJECT_SOURCE_DIR}/src/model
  13 @@ -253,7 +253,7 @@ endif()
  14
  15  # testing
  16  enable_testing()
  17 -add_subdirectory(gmock)
  18 +find_package(GTest REQUIRED)
  19
  20  file(GLOB run-test_src
  21      test/*.cpp
  22 @@ -262,7 +262,8 @@ add_executable(run-test
  23      ${run-test_src}
  24  )
  25  target_link_libraries(run-test
  26 -    gmock
  27 +    GTest::GTest
  28 +    GTest::Main
  29
  30      exporter
  31      importer
  32 diff --git a/test/testChewingExporter.cpp b/test/testChewingExporter.cpp
  33 index 911a453..b8bebf0 100644
  34 --- a/test/testChewingExporter.cpp
  35 +++ b/test/testChewingExporter.cpp
  36 @@ -17,7 +17,7 @@
  37   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  38   */
  39
  40 -#include "gtest/gtest.h"
  41 +#include <gtest/gtest.h>
  42
  43  #include <QDebug>
  44  #include <QFile>
  45 diff --git a/test/testChewingImporter.cpp b/test/testChewingImporter.cpp
  46 index 412c513..3b600d7 100644
  47 --- a/test/testChewingImporter.cpp
  48 +++ b/test/testChewingImporter.cpp
  49 @@ -17,7 +17,7 @@
  50   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  51   */
  52
  53 -#include "gtest/gtest.h"
  54 +#include <gtest/gtest.h>
  55
  56  #include <QDebug>
  57  #include <QDir>
  58 diff --git a/test/testHashImporter.cpp b/test/testHashImporter.cpp
  59 index 8f10a96..5c5be6b 100644
  60 --- a/test/testHashImporter.cpp
  61 +++ b/test/testHashImporter.cpp
  62 @@ -17,7 +17,7 @@
  63   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  64   */
  65
  66 -#include "gtest/gtest.h"
  67 +#include <gtest/gtest.h>
  68
  69  #include <QDebug>
  70  #include <QDir>
  71 diff --git a/test/testUserphraseImporter.cpp b/test/testUserphraseImporter.cpp
  72 index 17f3e27..54f2c0f 100644
  73 --- a/test/testUserphraseImporter.cpp
  74 +++ b/test/testUserphraseImporter.cpp
  75 @@ -17,7 +17,7 @@
  76   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  77   */
  78
  79 -#include "gtest/gtest.h"
  80 +#include <gtest/gtest.h>
  81
  82  #include <QDebug>
  83
  84 diff --git a/test/testUserphraseSet.cpp b/test/testUserphraseSet.cpp
  85 index f80d2d9..f73f33d 100644
  86 --- a/test/testUserphraseSet.cpp
  87 +++ b/test/testUserphraseSet.cpp
  88 @@ -17,7 +17,7 @@
  89   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  90   */
  91
  92 -#include "gtest/gtest.h"
  93 +#include <gtest/gtest.h>
  94
  95  #include "UserphraseSet.h"
  96
  97 diff --git a/test/testmain.cpp b/test/testmain.cpp
  98 index 0d58d49..e269919 100644
  99 --- a/test/testmain.cpp
 100 +++ b/test/testmain.cpp
 101 @@ -19,7 +19,7 @@
 102  #include <QApplication>
 103  #include <QFileInfo>
 104
 105 -#include "gtest/gtest.h"
 106 +#include <gtest/gtest.h>
 107
 108  bool verbose = false;
 109