CMake: Do not add po/ if USE_NLS is OFF

Previously, we would have generated all the translations, but not
turn them on in the code. Instead, move the Translation crap into
po/ and disable po/ alltogether if USE_NLS if OFF.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b63cfe0e82c1936ed5c096f7af0e092105a301ad..a43abfb781ecfed7ef5974760fafc6efcdf6f5cc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,6 @@ endif()
 
 # Include stuff
 include(Misc)
 
 # Include stuff
 include(Misc)

-include(Translations)

 include(CheckIncludeFiles)
 include(CheckFunctionExists)
 include(CheckStructHasMember)
 include(CheckIncludeFiles)
 include(CheckFunctionExists)
 include(CheckStructHasMember)


@@ -144,11 +143,14 @@ add_subdirectory(doc)
 add_subdirectory(dselect)
 add_subdirectory(ftparchive)
 add_subdirectory(methods)
 add_subdirectory(dselect)
 add_subdirectory(ftparchive)
 add_subdirectory(methods)

-add_subdirectory(po)

 add_subdirectory(test)
 
 add_subdirectory(test)
 

+if (USE_NLS)
+add_subdirectory(po)
+

 # Link update-po4a into the update-po target
 add_dependencies(update-po update-po4a)
 # Link update-po4a into the update-po target
 add_dependencies(update-po update-po4a)

+endif()

 
 # Create our directories.
 install_empty_directories(
 
 # Create our directories.
 install_empty_directories(

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 174cc5d41f2eb181db59d63bdab2b65835fd4782..258c9b0504e326b2e4733f17f4f407d6d06fdbd7 100644 (file)
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,3 +1,5 @@
+include(Translations)
+

 set(languages_excluded
     he  ## disabled by translator request #313283
 )
 set(languages_excluded
     he  ## disabled by translator request #313283
 )