Skip to content

Commit 80b489b

Browse files
victoryforceTurboGit
authored andcommitted
Make NLS support mandatory
1 parent e9128d1 commit 80b489b

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

CMakeLists.txt

+6-9
Original file line numberDiff line numberDiff line change
@@ -396,15 +396,12 @@ endif(USE_XMLLINT)
396396
message(STATUS "All external programs found")
397397

398398
# The path can be modified by setting CMAKE_INSTALL_LOCALEDIR
399-
if(USE_NLS)
400-
find_package(Gettext)
401-
if(GETTEXT_MSGFMT_EXECUTABLE)
402-
message(STATUS "Found msgfmt to convert .po file. Translation enabled")
403-
add_subdirectory(po)
404-
else()
405-
message(STATUS "Cannot find msgfmt to convert .po file. Translation won't be enabled")
406-
endif()
407-
endif(USE_NLS)
399+
find_package(Gettext REQUIRED)
400+
if(GETTEXT_MSGFMT_EXECUTABLE)
401+
add_subdirectory(po)
402+
else()
403+
message(FATAL_ERROR "ERROR: Cannot find msgfmt to convert .po file")
404+
endif()
408405

409406
# needed to generate file "preferences_gen.h" accordingly
410407
if(USE_OPENCL)

DefineOptions.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
option(USE_CAMERA_SUPPORT "Detect and use camera support if available." ON)
2-
option(USE_NLS "Build Native Language Support (using gettext)" ON)
32
option(USE_COLORD "Enable colord support" ON)
43
option(USE_MAP "Build Map View parts" ON)
54
option(USE_LUA "Build lua scripting support" ON)

build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ CMAKE_OPTIONS_FROM_CMDLINE=""
3535

3636
PRINT_HELP=0
3737

38-
FEATURES="CAMERA COLORD GRAPHICSMAGICK IMAGEMAGICK JXL KWALLET LIBSECRET LUA MAC_INTEGRATION MAP NLS OPENCL OPENEXR OPENMP UNITY WEBP"
38+
FEATURES="CAMERA COLORD GRAPHICSMAGICK IMAGEMAGICK JXL KWALLET LIBSECRET LUA MAC_INTEGRATION MAP OPENCL OPENEXR OPENMP UNITY WEBP"
3939

4040
# prepare a lowercase version with a space before and after
4141
# it's very important for parse_feature, has no impact in for loop expansions

0 commit comments

Comments
 (0)