X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=po%2FCMakeLists.txt;h=8b972e61c855c2d50c11b0538c204a3b98e6b3d3;hb=a99960cc0491a40b77c48816c9a7bd46d49ac742;hp=fcceade5bb2fecb95017fc25921014239b350985;hpb=41f9efb519e60652e503ebdf1edd9ff3d9330de9;p=lyx.git

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index fcceade5bb..8b972e61c8 100755
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -88,6 +88,8 @@ ADD_CUSTOM_COMMAND(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot"
     COMMAND ${LYX_PYTHON_EXECUTABLE}
     ARGS   "${TOP_SRC_DIR}/development/cmake/po/cat.py" ${_py_sources} > "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot"
+    COMMAND ${LYX_PYTHON_EXECUTABLE}
+      ARGS   "${TOP_SRC_DIR}/development/cmake/po/dos2unix.py" "${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot"
     DEPENDS ${_py_sources}
     )
 
@@ -103,7 +105,7 @@ SET(_potfiles_dep)
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in "")
 file(GLOB_RECURSE _tmp_potfiles RELATIVE ${TOP_SRC_DIR}/ ${TOP_SRC_DIR}/src/*.h  ${TOP_SRC_DIR}/src/*.cpp  ${TOP_SRC_DIR}/src/*.cpp.in)
 list(SORT _tmp_potfiles)
-list(REMOVE_ITEM _tmp_potfiles src/support/Package.cpp)
+# list(REMOVE_ITEM _tmp_potfiles src/support/Package.cpp)
 
 foreach(_f ${_tmp_potfiles})
   # we don't need to select only relevant files because the outcome of xgettext
@@ -141,12 +143,23 @@ endforeach(_pofile)
 
 set(LYX_UPDATED_PO_FILES)
 foreach(_pofile ${LYX_BASE_PO_FILES})
-  add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_pofile}.copied
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/${_pofile} ${LYX_DEST_PO}/${_pofile}
-    COMMAND ${CMAKE_COMMAND} -E touch ${_pofile}.copied
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_pofile}
-    )
+  if(WIN32)
+    add_custom_command(
+      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_pofile}.copied
+      COMMAND ${LYX_PYTHON_EXECUTABLE}
+        ARGS   "${TOP_SRC_DIR}/development/cmake/po/unix2dos.py" "${CMAKE_CURRENT_BINARY_DIR}/${_pofile}"
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/${_pofile} ${LYX_DEST_PO}/${_pofile}
+      COMMAND ${CMAKE_COMMAND} -E touch ${_pofile}.copied
+      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_pofile}
+      )
+  else()
+    add_custom_command(
+      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_pofile}.copied
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/${_pofile} ${LYX_DEST_PO}/${_pofile}
+      COMMAND ${CMAKE_COMMAND} -E touch ${_pofile}.copied
+      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_pofile}
+      )
+  endif()
   list(APPEND LYX_UPDATED_PO_FILES ${CMAKE_CURRENT_BINARY_DIR}/${_pofile}.copied)
 endforeach(_pofile)