Skip to content

Commit da80351

Browse files
committed
Remove fcitx submodule, use CMake bundled Intl detection module
1 parent ecb2be7 commit da80351

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "lib/CMake-Gettext"]
22
path = lib/CMake-Gettext
33
url = https://github.com/jarro2783/CMake-Gettext.git
4-
[submodule "lib/fcitx"]
5-
path = lib/fcitx
6-
url = https://github.com/fcitx/fcitx.git

CMakeLists.txt

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,10 @@ set(VIOLET_LIBRARIES ${VIOLET_LIBRARIES} ${Boost_LIBRARIES})
4848
add_definitions(-DBOOST_FILESYSTEM_VERSION=3)
4949

5050

51-
# Searching for libintl using bundled CMake script
52-
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/lib/fcitx/cmake")
53-
include(FindLibintl)
54-
55-
if(${MINGW})
56-
set(LIBINTL_LIBRARIES intl)
57-
endif(${MINGW})
58-
59-
set(VIOLET_INCLUDE_DIRS ${VIOLET_INCLUDE_DIRS} ${LIBINTL_INCLUDE_DIR})
60-
set(VIOLET_LIBRARIES ${VIOLET_LIBRARIES} ${LIBINTL_LIBRARIES})
51+
# Intl
52+
find_package(Intl REQUIRED)
53+
set(VIOLET_INCLUDE_DIRS ${VIOLET_INCLUDE_DIRS} ${Intl_INCLUDE_DIR})
54+
set(VIOLET_LIBRARIES ${VIOLET_LIBRARIES} ${Intl_LIBRARIES})
6155

6256

6357

lib/fcitx

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)