cmake/DaemonGame: set NACL_VMS_PROJECTS

Author: illwieckz

cmake/DaemonGame.cmake

@@ -77,6 +77,8 @@ function(GAMEMODULE)
             endforeach(inherited_option)
 
             if (USE_NACL_SAIGO)
+                unset(NACL_VMS_PROJECTS)
+
                 foreach(NACL_TARGET ${NACL_TARGETS})
                     if (NACL_TARGET STREQUAL "i686")
                         set(SAIGO_ARCH "i686")
@@ -88,9 +90,12 @@ function(GAMEMODULE)
                         message(FATAL_ERROR "Unknown NaCl architecture ${NACL_TARGET}")
                     endif()
 
-                    ExternalProject_Add(${vm}-${NACL_TARGET}
+                    set(NACL_VMS_PROJECT ${vm}-${NACL_TARGET})
+                    list(APPEND NACL_VMS_PROJECTS ${NACL_VMS_PROJECT})
+
+                    ExternalProject_Add(${NACL_VMS_PROJECT}
                         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-                        BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${vm}-${NACL_TARGET}
+                        BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${NACL_VMS_PROJECT}
                         CMAKE_GENERATOR ${VM_GENERATOR}
                         CMAKE_ARGS
                             -DFORK=2
@@ -109,14 +114,26 @@ function(GAMEMODULE)
                             ${inherited_option_args}
                         INSTALL_COMMAND ""
                     )
+
+                    # Force the rescan and rebuild of the subproject.
+                    ExternalProject_Add_Step(${NACL_VMS_PROJECT} forcebuild
+                        COMMAND ${CMAKE_COMMAND} -E remove
+                            ${CMAKE_CURRENT_BINARY_DIR}/${NACL_VMS_PROJECT}-prefix/src/${NACL_VMS_PROJECT}-stamp/${NACL_VMS_PROJECT}-configure
+                        COMMENT "Forcing build step for '${NACL_VMS_PROJECT}'"
+                        DEPENDEES build
+                        ALWAYS 1
+                    )
                 endforeach()
             else()
+                set(NACL_VMS_PROJECT ${vm})
+                set(NACL_VMS_PROJECTS ${NACL_VMS_PROJECT})
+
                 # Workaround a bug where CMake ExternalProject lists-as-args are cut on first “;”
                 string(REPLACE ";" "," NACL_TARGETS_STRING "${NACL_TARGETS}")
 
-                ExternalProject_Add(${vm}
+                ExternalProject_Add(${NACL_VMS_PROJECT}
                     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-                    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${vm}
+                    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${NACL_VMS_PROJECT}
                     CMAKE_GENERATOR ${VM_GENERATOR}
                     CMAKE_ARGS
                         -DFORK=2
@@ -133,10 +150,12 @@ function(GAMEMODULE)
                         ${inherited_option_args}
                     INSTALL_COMMAND ""
                 )
-                ExternalProject_Add_Step(${vm} forcebuild
+
+                # Force the rescan and rebuild of the subproject.
+                ExternalProject_Add_Step(${NACL_VMS_PROJECT} forcebuild
                     COMMAND ${CMAKE_COMMAND} -E remove
-                        ${CMAKE_CURRENT_BINARY_DIR}/${vm}-prefix/src/${vm}-stamp/${vm}-configure
-                    COMMENT "Forcing build step for '${vm}'"
+                        ${CMAKE_CURRENT_BINARY_DIR}/${NACL_VMS_PROJECT}-prefix/src/${NACL_VMS_PROJECT}-stamp/${NACL_VMS_PROJECT}-configure
+                    COMMENT "Forcing build step for '${NACL_VMS_PROJECT}'"
                     DEPENDEES build
                     ALWAYS 1
                 )