Re: [LyX/master] CMake: Add target update-gmo

[Kornel Benko]

Am Dienstag, 4. Februar 2014 um 16:12:09, schrieb Vincent van Ravesteijn 
<v...@lyx.org>
> > The other one, "${LYX_DEST_PO}/${_gmo}", is needed in the else() part
> >
> > of 'if(LYX_GITVERSION) and in ADD_CUSTOM_TARGET(update-po ...)
> >
> >
> >
> > Maybe we should make two lists?
> >
> 
> You can just put the other one also in the else() part.
> 

On a first look, you may be right.

I create a modified patch.

        Kornel
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index a8e60a6..676ecde 100755
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -169,13 +169,14 @@ FIND_PROGRAM(LYX_GITVERSION git)
 set(LYX_UPDATED_GMO_FILES)
 foreach(_gmo_base ${INSTALLED_LANGUAGES})
   set(_gmo ${_gmo_base}.gmo)
-  list(APPEND LYX_UPDATED_GMO_FILES "${LYX_DEST_PO}/${_gmo}")
+  set(_tobeupdated "${CMAKE_CURRENT_BINARY_DIR}/${_gmo}.tobeupdated")
+  list(APPEND LYX_UPDATED_GMO_FILES "${_tobeupdated}")
   if(LYX_GITVERSION)
     add_custom_command(
-      OUTPUT "${LYX_DEST_PO}/${_gmo}"
-	  COMMAND "${LYX_GITVERSION}" "status" "--porcelain" "${_gmo_base}.po" ">" "${CMAKE_CURRENT_BINARY_DIR}/${_gmo}.tobeupdated"
+      OUTPUT "${_tobeupdated}"
+	  COMMAND "${LYX_GITVERSION}" "status" "--porcelain" "${_gmo_base}.po" ">" "${_tobeupdated}"
 	  COMMAND ${LYX_PYTHON_EXECUTABLE} "${TOP_CMAKE_PATH}/po/update-gmo.py" 
-		"${CMAKE_CURRENT_BINARY_DIR}/${_gmo}.tobeupdated"
+		"${_tobeupdated}"
 		"${CMAKE_CURRENT_BINARY_DIR}/${_gmo}"
 		"${LYX_DEST_PO}/${_gmo}"
 	  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
@@ -183,8 +184,9 @@ foreach(_gmo_base ${INSTALLED_LANGUAGES})
       )
   else()
     add_custom_command(
-      OUTPUT "${LYX_DEST_PO}/${_gmo}"
+      OUTPUT "${_tobeupdated}"
       COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_BINARY_DIR}/${_gmo}" "${LYX_DEST_PO}/${_gmo}"
+      COMMAND ${CMAKE_COMMAND} -E touch "${_tobeupdated}"
       DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${_gmo}"
     )
   endif()

signature.asc
Description: This is a digitally signed message part.