COMP: Fixed listings of source files to translate. WARNING: Do not compile...

COMP: Fixed listings of source files to translate. WARNING: Do not compile with -DMERGE_TS:BOOL=ON (compilation problem which is being fixed).

CMake/i18n_qt4.cmake

 #
+# Declare and initialize variable to be present in parent scope.
+# set( Monteverdi2_I18N_SOURCE_FILES
+#   ""
+#   CACHE INTERNAL "" FORCE
+#   )
+#
 # Set locale human-readable translation files.
-macro( add_to_qt4_i18n_sources SOURCES)
-  # message( STATUS "Added I18N sources:'${ARGV}'" )
-  set( i18n_SOURCES ${i18n_SOURCES} ${ARGV} )
+macro( add_to_qt4_i18n_sources SOURCE_FILES )
+  #message( "i18n_sources 1: '${Monteverdi2_I18N_SOURCE_FILES}'" )
+  #message( STATUS "Adding I18N sources:'${ARGV}'" )
+  set( Monteverdi2_I18N_SOURCE_FILES
+    ${Monteverdi2_I18N_SOURCE_FILES} ${ARGV}
+    CACHE INTERNAL "" FORCE
+    )
+  #message( "i18n_sources 2: '${Monteverdi2_I18N_SOURCE_FILES}'" )
 endmacro()

CMakeLists.txt

@@ -168,6 +168,7 @@ set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${Monteverdi2_BINARY_DIR}/lib )
 #----------------------------------------------------------------------------
 # Code location
 add_subdirectory( Code )
+# i18n directory must be added after all source files (see add_qt1_i18n_sources).
 add_subdirectory( i18n )
 
 #----------------------------------------------------------------------------

Code/CMakeLists.txt

 # PROJECT(Monteverdi2)
 
-add_subdirectory(Application)
 add_subdirectory(Common)
+add_subdirectory(Application)

i18n/CMakeLists.txt

@@ -13,8 +13,11 @@ option( MERGE_TS "Create/merge .ts source translation files. WARNING: 'make clea
 #
 # Sources to translate.
 if( MERGE_TS )
+  #message( "Merging I18N sources/translations." )
+  message( "I18N sources: '${Monteverdi2_I18N_SOURCE_FILES}'" )
+  #message( "I18N translations: '${Monteverdi2_TS_TRANSLATIONS}'" )
   qt4_create_translation( Monteverdi2_QM_TRANSLATIONS
-    ${i18n_SOURCES}
+    ${Monteverdi2_I18N_SOURCE_FILES}
     ${Monteverdi2_TS_TRANSLATIONS}
     )
 endif()