From a3a9fffb6ee89adc327ad8a7dec05d5f35414f9d Mon Sep 17 00:00:00 2001
From: Felix Yan <felixonmars@archlinux.org>
Date: Sat, 14 Mar 2020 23:15:32 +0800
Subject: [PATCH] Use RimeData instead of Brise (#45)

Brise has been deprecated for years. Let's use the new name.
---
 CMakeLists.txt           |  3 +--
 cmake/FindBrise.cmake    | 26 --------------------------
 cmake/FindRimeData.cmake | 23 +++++++++++++++++++++++
 3 files changed, 24 insertions(+), 28 deletions(-)
 delete mode 100644 cmake/FindBrise.cmake
 create mode 100644 cmake/FindRimeData.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35f7dd1..b4e5897 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,8 +9,7 @@ find_package(Fcitx 4.2.8.1 REQUIRED)
 pkg_check_modules(RIME "rime>=1.0.0" REQUIRED)
 
 if(NOT DEFINED RIME_DATA_DIR)
-  find_package(Brise REQUIRED)
-  set(RIME_DATA_DIR ${BRISE_DIR})
+  find_package(RimeData REQUIRED)
 endif(NOT DEFINED RIME_DATA_DIR)
 message(STATUS "Precompiler macro RIME_DATA_DIR is set to \"${RIME_DATA_DIR}\"")
 add_definitions(-DRIME_DATA_DIR="${RIME_DATA_DIR}")
diff --git a/cmake/FindBrise.cmake b/cmake/FindBrise.cmake
deleted file mode 100644
index 9803f80..0000000
--- a/cmake/FindBrise.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-# Author: Marguerite Su <i@marguerite.su>
-# License: same as fcitx
-# Description: find RIME brise schemas collection package.
-# BRISE_FOUND - System has brise package
-# BRISE_DIR - Brise absolute path
-
-set(BRISE_FIND_DIR "${CMAKE_INSTALL_PREFIX}/share/brise"
-                   "${CMAKE_INSTALL_PREFIX}/share/rime-data"
-                   "${CMAKE_INSTALL_PREFIX}/share/rime/data"
-                   "/usr/share/brise"
-                   "/usr/share/rime-data"
-                   "/usr/share/rime/data")
-
-set(BRISE_FOUND FALSE)
-
-foreach(_BRISE_DIR ${BRISE_FIND_DIR})
-    if (IS_DIRECTORY ${_BRISE_DIR})
-        set(BRISE_FOUND True)
-        set(BRISE_DIR ${_BRISE_DIR})
-    endif (IS_DIRECTORY ${_BRISE_DIR})
-endforeach(_BRISE_DIR)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Brise DEFAULT_MSG
-				  BRISE_DIR)
-mark_as_advanced(BRISE_DIR)
diff --git a/cmake/FindRimeData.cmake b/cmake/FindRimeData.cmake
new file mode 100644
index 0000000..20e95f7
--- /dev/null
+++ b/cmake/FindRimeData.cmake
@@ -0,0 +1,23 @@
+# Author: Marguerite Su <i@marguerite.su>
+# License: GPL
+# Description: find Rime schema collection package.
+# RIME_DATA_FOUND - System has rime-data package
+# RIME_DATA_DIR - rime-data absolute path
+
+set(RIME_DATA_FIND_DIR "${CMAKE_INSTALL_PREFIX}/share/rime-data"
+                       "${CMAKE_INSTALL_PREFIX}/share/rime/data"
+                       "/usr/share/rime-data"
+                       "/usr/share/rime/data")
+
+set(RIME_DATA_FOUND FALSE)
+
+foreach(_RIME_DATA_DIR ${RIME_DATA_FIND_DIR})
+    if (IS_DIRECTORY ${_RIME_DATA_DIR})
+        set(RIME_DATA_FOUND True)
+        set(RIME_DATA_DIR ${_RIME_DATA_DIR})
+    endif (IS_DIRECTORY ${_RIME_DATA_DIR})
+endforeach(_RIME_DATA_DIR)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(RimeData DEFAULT_MSG RIME_DATA_DIR)
+mark_as_advanced(RIME_DATA_DIR)