Skip to content

Commit ca57cb6

Browse files
committed
refactor(cmake/FindRimeData.cmake): deprecate brise
1 parent b1f9a55 commit ca57cb6

File tree

3 files changed

+24
-27
lines changed

3 files changed

+24
-27
lines changed

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ if(Rime_FOUND)
2424
endif(Rime_FOUND)
2525

2626
if(NOT DEFINED RIME_DATA_DIR)
27-
find_package(Brise REQUIRED)
28-
set(RIME_DATA_DIR ${BRISE_DIR})
27+
find_package(RimeData REQUIRED)
2928
endif(NOT DEFINED RIME_DATA_DIR)
3029
message(STATUS "Precompiler macro RIME_DATA_DIR is set to \"${RIME_DATA_DIR}\"")
3130
add_definitions(-DRIME_DATA_DIR="${RIME_DATA_DIR}")

cmake/FindBrise.cmake

Lines changed: 0 additions & 25 deletions
This file was deleted.

cmake/FindRimeData.cmake

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Author: Marguerite Su <[email protected]>
2+
# License: GPL
3+
# Description: find Rime schema collection package.
4+
# RIME_DATA_FOUND - System has rime-data package
5+
# RIME_DATA_DIR - rime-data absolute path
6+
7+
set(RIME_DATA_FIND_DIR "${CMAKE_INSTALL_PREFIX}/share/rime-data"
8+
"${CMAKE_INSTALL_PREFIX}/share/rime/data"
9+
"/usr/share/rime-data"
10+
"/usr/share/rime/data")
11+
12+
set(RIME_DATA_FOUND FALSE)
13+
14+
foreach(_RIME_DATA_DIR ${RIME_DATA_FIND_DIR})
15+
if (IS_DIRECTORY ${_RIME_DATA_DIR})
16+
set(RIME_DATA_FOUND True)
17+
set(RIME_DATA_DIR ${_RIME_DATA_DIR})
18+
endif (IS_DIRECTORY ${_RIME_DATA_DIR})
19+
endforeach(_RIME_DATA_DIR)
20+
21+
include(FindPackageHandleStandardArgs)
22+
find_package_handle_standard_args(RimeData DEFAULT_MSG RIME_DATA_DIR)
23+
mark_as_advanced(RIME_DATA_DIR)

0 commit comments

Comments
 (0)