Merge 8085d15 into 3ff613d

CMakeLists.txt

@@ -543,8 +543,10 @@ set(BUILD_DIRECTORY_FILENAME ${PROJECT_BUILD_DIR}/builddirectory.txt)
 file(WRITE ${SOURCE_DIRECTORY_FILENAME} "${CMAKE_SOURCE_DIR}")
 file(WRITE ${BUILD_DIRECTORY_FILENAME} "${PROJECT_BUILD_DIR}")
 
-keep_track_of_file(${SOURCE_DIRECTORY_FILENAME})
-keep_track_of_file(${BUILD_DIRECTORY_FILENAME})
+track_files(
+    ${SOURCE_DIRECTORY_FILENAME}
+    ${BUILD_DIRECTORY_FILENAME}
+)
 
 # Version/snapshot of OpenCOR
 
@@ -566,7 +568,7 @@ set(VERSION_DATE_FILENAME ${PROJECT_BUILD_DIR}/versiondate.txt)
 
 file(WRITE ${VERSION_DATE_FILENAME} "${VERSION}\n${DATE}")
 
-keep_track_of_file(${VERSION_DATE_FILENAME})
+track_files(${VERSION_DATE_FILENAME})
 
 # Configure our help file
 
@@ -755,7 +757,7 @@ if(ENABLE_TESTS)
 
     file(WRITE ${TESTS_LIST_FILENAME})
 
-    keep_track_of_file(${TESTS_LIST_FILENAME})
+    track_files(${TESTS_LIST_FILENAME})
 
     # Destination tests directory
     # Note: DEST_TESTS_DIR isn't only used here, but also in our add_plugin()

cmake/common.cmake

@@ -1,12 +1,14 @@
-macro(keep_track_of_file FILE_NAME)
-    # Keep track of the given file
+macro(track_files)
+    # Keep track of the given files
     # Note: indeed, some files (e.g. versiondate.txt) are 'manually' generated
     #       and then used to build other files. Now, the 'problem' is that
     #       Ninja needs to know about those files (see CMake policy CMP0058),
     #       which we ensure it does through the below...
 
-    add_custom_command(OUTPUT ${FILE_NAME}
-                       COMMAND ${CMAKE_COMMAND} -E sleep 0)
+    foreach(FILENAME ${ARGN})
+        add_custom_command(OUTPUT ${FILENAME}
+                           COMMAND ${CMAKE_COMMAND} -E sleep 0)
+    endforeach()
 endmacro()
 
 #===============================================================================
@@ -36,7 +38,7 @@ macro(update_language_files TARGET_NAME)
                                                           -qm ${QM_FILE}
                             OUTPUT_QUIET)
 
-            keep_track_of_file(${QM_FILE})
+            track_files(${QM_FILE})
         endif()
     endforeach()
 endmacro()

src/plugins/miscellaneous/HelpWindow/CMakeLists.txt

@@ -6,8 +6,10 @@ execute_process(COMMAND ${QT_BINARY_DIR}/qcollectiongenerator ${PROJECT_BUILD_DI
                                                            -o ${PROJECT_BUILD_DIR}/${CMAKE_PROJECT_NAME}.qhc
                 OUTPUT_QUIET)
 
-keep_track_of_file(${PROJECT_BUILD_DIR}/${CMAKE_PROJECT_NAME}.qch)
-keep_track_of_file(${PROJECT_BUILD_DIR}/${CMAKE_PROJECT_NAME}.qhc)
+track_files(
+    ${PROJECT_BUILD_DIR}/${CMAKE_PROJECT_NAME}.qch
+    ${PROJECT_BUILD_DIR}/${CMAKE_PROJECT_NAME}.qhc
+)
 
 # Add the plugin