diff --git a/.gitmodules b/.gitmodules index 4b9c64c..0ef4890 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,8 @@ [submodule "libchewing"] path = libchewing url = https://github.com/chewing/libchewing.git + branch = 0.8.x [submodule "libIME"] path = libIME url = https://github.com/EasyIME/libIME.git + branch = master diff --git a/CMakeLists.txt b/CMakeLists.txt index 76f9a0b..53ebcad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 3.24.0) # override default c/c++ flags, add /MT to link VC++ runtime statically. set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake) diff --git a/ChewingPreferences/CMakeLists.txt b/ChewingPreferences/CMakeLists.txt index c69f6f8..5dab89e 100644 --- a/ChewingPreferences/CMakeLists.txt +++ b/ChewingPreferences/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 2.8.8) - project(ChewingPreferences) # http://www.utf8everywhere.org/ diff --git a/ChewingTextService/CMakeLists.txt b/ChewingTextService/CMakeLists.txt index 9f39bec..7d66562 100644 --- a/ChewingTextService/CMakeLists.txt +++ b/ChewingTextService/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 2.8.8) - project(ChewingTextService) if(NOT DEFINED PROJECT_LIBCHEWING) diff --git a/chewingwrapper/CMakeLists.txt b/chewingwrapper/CMakeLists.txt index f4c5122..c12458b 100644 --- a/chewingwrapper/CMakeLists.txt +++ b/chewingwrapper/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 2.8.8) project(chewingwrapper) if(NOT DEFINED PROJECT_LIBCHEWING OR NOT DEFINED CHEWING_DATA_PREFIX) diff --git a/libIME b/libIME index d4e6cb4..d347cb6 160000 --- a/libIME +++ b/libIME @@ -1 +1 @@ -Subproject commit d4e6cb41ea7d673a3b679ec9af282cea6e22cd6a +Subproject commit d347cb63747c510a599df08602b7aeb060726dc3 diff --git a/libchewing b/libchewing index ce66aa6..b57d968 160000 --- a/libchewing +++ b/libchewing @@ -1 +1 @@ -Subproject commit ce66aa6e993363a26ea312f9c315ae68c793ec50 +Subproject commit b57d968bfaee4c893b581eeccfe5429f61a94581