OSDN Git Service

Merge pull request #1563 from LordTermor/calamares
authorAdriaan de Groot <groot@kde.org>
Tue, 10 Nov 2020 00:19:44 +0000 (01:19 +0100)
committerGitHub <noreply@github.com>
Tue, 10 Nov 2020 00:19:44 +0000 (01:19 +0100)
[users] Full name transliteration support for user creation

1  2 
src/modules/users/CMakeLists.txt
src/modules/users/Config.cpp
src/modules/usersq/CMakeLists.txt

@@@ -21,15 -21,26 +21,27 @@@ if( LibPWQuality_FOUND 
      add_definitions( -DCHECK_PWQUALITY -DHAVE_LIBPWQUALITY )
  endif()
  
+ find_package( ICU COMPONENTS uc i18n )
+ set_package_properties(
+     ICU PROPERTIES
+     PURPOSE "Transliteration support for full name to username conversion"
+ )
+ if( ICU_FOUND )
+     list( APPEND USER_EXTRA_LIB ICU::uc ICU::i18n )
+     include_directories( ${ICU_INCLUDE_DIRS} )
+     add_definitions( -DHAVE_ICU )
+ endif()
  include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
  
 -set( JOB_SRC
 +set( _users_src
 +    # Jobs
      CreateUserJob.cpp
 +    MiscJobs.cpp
      SetPasswordJob.cpp
      SetHostNameJob.cpp
 -)
 -set( CONFIG_SRC
 +    # Configuration
      CheckPWQuality.cpp
      Config.cpp
  )
Simple merge
Simple merge