Skip to content

Commit

Permalink
Revert "Add external_sonnet library"
Browse files Browse the repository at this point in the history
This reverts commit 81705fb.
  • Loading branch information
ilya-fedin authored and john-preston committed Nov 25, 2022
1 parent 7267c03 commit 25088a5
Show file tree
Hide file tree
Showing 9 changed files with 2 additions and 165 deletions.
3 changes: 0 additions & 3 deletions external/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ add_checked_subdirectory(qr_code_generator)
add_checked_subdirectory(ranges)
add_checked_subdirectory(rlottie)
add_checked_subdirectory(rnnoise)
if (add_sonnet_library)
add_checked_subdirectory(sonnet)
endif()
add_checked_subdirectory(ton)
add_checked_subdirectory(variant)
add_checked_subdirectory(vpx)
Expand Down
110 changes: 0 additions & 110 deletions external/sonnet/CMakeLists.txt

This file was deleted.

23 changes: 0 additions & 23 deletions external/sonnet/generate_trigrams.cmake

This file was deleted.

Empty file.
3 changes: 0 additions & 3 deletions external/sonnet/headers/private/core_debug.h

This file was deleted.

3 changes: 0 additions & 3 deletions external/sonnet/headers/private/hunspelldebug.h

This file was deleted.

3 changes: 0 additions & 3 deletions external/sonnet/headers/private/nsspellcheckerdebug.h

This file was deleted.

Empty file.
22 changes: 2 additions & 20 deletions variables.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,10 @@ option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no
option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate})
option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF)
cmake_dependent_option(DESKTOP_APP_USE_ENCHANT "Use Enchant instead of bundled Hunspell." OFF LINUX OFF)
cmake_dependent_option(DESKTOP_APP_USE_CLD3 "Disable system text language recognition and use bundled cld3 only." OFF APPLE ON)
cmake_dependent_option(DESKTOP_APP_NO_PDB "Disable PDB file generation." OFF WIN32 OFF)
cmake_dependent_option(DESKTOP_APP_DISABLE_JEMALLOC "Disable jemalloc, use system malloc." OFF LINUX OFF)

if (APPLE)
set(language_recognition_default SYSTEM)
elseif (WIN32)
set(language_recognition_default CLD3)
else()
set(language_recognition_default SONNET)
endif()
set(DESKTOP_APP_LANGUAGE_RECOGNITION_BACKEND "${language_recognition_default}" CACHE STRING "Text language recognition backend.")
set_property(CACHE DESKTOP_APP_LANGUAGE_RECOGNITION_BACKEND PROPERTY STRINGS SYSTEM CLD3 SONNET)
if (LINUX AND DESKTOP_APP_LANGUAGE_RECOGNITION_BACKEND STREQUAL SYSTEM)
set(DESKTOP_APP_LANGUAGE_RECOGNITION_BACKEND "${language_recognition_default}")
endif()

if (APPLE AND NOT DEFINED DESKTOP_APP_MAC_ARCH)
if (DEFINED CMAKE_OSX_ARCHITECTURES)
set(DESKTOP_APP_MAC_ARCH "${CMAKE_OSX_ARCHITECTURES}" CACHE STRING "Target macOS arch.")
Expand All @@ -64,16 +52,10 @@ if ((WIN32
endif()

set(add_cld3_library 0)
if (DESKTOP_APP_LANGUAGE_RECOGNITION_BACKEND STREQUAL CLD3)
if (LINUX OR DESKTOP_APP_USE_CLD3)
set(add_cld3_library 1)
endif()

set(add_sonnet_library 0)
if (DESKTOP_APP_LANGUAGE_RECOGNITION_BACKEND STREQUAL SONNET)
set(add_sonnet_library 1)
set(add_hunspell_library 1)
endif()

set(build_macstore 0)
set(build_winstore 0) # 32 or 64 bit
set(build_win64 0) # normal or uwp
Expand Down

0 comments on commit 25088a5

Please sign in to comment.