From 0c696eb1b90dc5dac955b23624862ad494dea162 Mon Sep 17 00:00:00 2001 From: Qijia Liu Date: Sat, 19 Aug 2023 22:55:56 -0400 Subject: [PATCH] drop BOOST_USE_CXX11; fix 2 cmake warnings --- CMakeLists.txt | 7 +------ build.bat | 1 - deps/CMakeLists.txt | 1 + 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5262f1681..6f8d4d451 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,8 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake) set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_flag_overrides.cmake) -project(rime) cmake_minimum_required(VERSION 3.12) +project(rime) set(CMAKE_CXX_STANDARD 14) set(rime_version 1.8.5) @@ -20,7 +20,6 @@ option(BUILD_SAMPLE "Build sample Rime plugin" OFF) option(BUILD_TEST "Build and run tests" ON) option(BUILD_SEPARATE_LIBS "Build separate rime-* libraries" OFF) option(ENABLE_LOGGING "Enable logging with google-glog library" ON) -option(BOOST_USE_CXX11 "Boost has been built with C++11 support" OFF) option(BOOST_USE_SIGNALS2 "Boost use signals2 instead of signals" ON) option(ENABLE_ASAN "Enable Address Sanitizer (Unix Only)" OFF) option(INSTALL_PRIVATE_HEADERS "Install private headers (usually needed for externally built Rime plugins)" OFF) @@ -59,10 +58,6 @@ if(MSVC) set(Boost_USE_STATIC_RUNTIME ON) endif() -if(NOT BOOST_USE_CXX11) - add_definitions("-DBOOST_NO_CXX11_SCOPED_ENUMS") -endif() - set(BOOST_COMPONENTS filesystem regex system) if(BOOST_USE_SIGNALS2) diff --git a/build.bat b/build.bat index f6b43edda..713a86eb9 100644 --- a/build.bat +++ b/build.bat @@ -271,7 +271,6 @@ set rime_cmake_flags=%common_cmake_flags%^ -DBUILD_SHARED_LIBS=%build_shared%^ -DBUILD_TEST=%build_test%^ -DENABLE_LOGGING=%enable_logging%^ - -DBOOST_USE_CXX11=ON^ -DCMAKE_CONFIGURATION_TYPES="%build_config%"^ -DCMAKE_INSTALL_PREFIX:PATH="%RIME_ROOT%\dist" diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index a20440b31..181e2f780 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.10) +project(marisa) # libmarisa