Disentangle CiteEngines and Modules

[lyx.git] / po / CMakeLists.txt

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index e9cec52d1107643b6e4311d396a124a6d117f5c8..590921cd6c52d3e24bac2a84513598c1140872c7 100755 (executable)
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -11,6 +11,7 @@ include_directories(${TOP_SRC_DIR}/po)
 
 SET(_lyxname ${PACKAGE})
 SET(_py_sources)
+
 macro(add_gettext_python  _par _dir)
   set(_sources)
   foreach(_arg ${ARGN})
@@ -40,13 +41,23 @@ macro(add_gettext_python  _par _dir)
     DEPENDS ${_tmp_src_files}
   )
   if (${_par} MATCHES "layouttranslations")
+    # lyx_pot.py requires the module "polib" if using target layouttranslations1,
+    # so we have to check for it
+    find_python_module("polib")
+    if ("${LYX_PY_POLIB}" STREQUAL "")
+      message(STATUS "You will be unable to update layouttranslations file")
+    endif()
     ADD_CUSTOM_COMMAND(
       OUTPUT "${_dst}"
       PRE_BUILD
-      COMMAND  ${CMAKE_COMMAND} -E copy_if_different "${TOP_SRC_DIR}/lib/layouttranslations" "${_dst}"
-      COMMAND ${LYX_PYTHON_EXECUTABLE}
-      ARGS "${TOP_SRC_DIR}/po/lyx_pot.py" -b "${TOP_SRC_DIR}" -o "${_dst}" -t ${_par1} "--src_file=${_src_files}"
-      COMMAND  ${CMAKE_COMMAND} -E copy_if_different "${_dst}" "${TOP_SRC_DIR}/lib/layouttranslations"
+      COMMAND  ${CMAKE_COMMAND}
+       "-DTOP_SRC_DIR=${TOP_SRC_DIR}"
+       "-DDestFile=${_dst}"
+       "-DLYX_PYTHON_EXECUTABLE=${LYX_PYTHON_EXECUTABLE}"
+       "-DParType=${_par1}"
+       "-DSources=${_src_files}"
+        "-DLYX_PY_POLIB=${LYX_PY_POLIB}"
+       -P "${TOP_SRC_DIR}/po/CreateLayoutTranslations.cmake"
       DEPENDS ${_sources} ${_src_files} "${TOP_SRC_DIR}/lib/layouttranslations"
       COMMENT "${LYX_PYTHON_EXECUTABLE} ${TOP_SRC_DIR}/po/lyx_pot.py -b ${TOP_SRC_DIR} -o  ${_dst} -t ${_par1} --src_file=${_src_files}"
       )
@@ -90,8 +101,6 @@ ADD_CUSTOM_COMMAND(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot"
     COMMAND ${LYX_PYTHON_EXECUTABLE}
     ARGS   "${TOP_CMAKE_PATH}/po/cat.py" ${_py_sources} > "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat_tmp.pot"
-    COMMAND ${LYX_PYTHON_EXECUTABLE}
-      ARGS   "${TOP_CMAKE_PATH}/po/dos2unix.py" "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat_tmp.pot"
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
       "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat_tmp.pot" "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot"
     DEPENDS ${_py_sources}
@@ -129,6 +138,7 @@ ADD_CUSTOM_COMMAND(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.pot"
     COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.fmt.pot" "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.pot"
     COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE}
+      --from-code=UTF-8
       --default-domain=${_lyxname} --directory=${TOP_SRC_DIR}
       --add-comments=TRANSLATORS:
       --language=C++ --join-existing --keyword=_ --keyword=N_ --keyword=B_ --keyword=qt_