Skip to content

Commit efe1863

Browse files
committed
cmake/DaemonGame: rename back VMS_PROJECT to NACL_VMS_PROJECT
Fixup for #1555
1 parent d6fdafd commit efe1863

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

cmake/DaemonGame.cmake

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ function(buildGameModule module_slug)
137137
endfunction()
138138

139139
function(gameSubProject)
140-
ExternalProject_Add(${VMS_PROJECT}
140+
ExternalProject_Add(${NACL_VMS_PROJECT}
141141
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
142-
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${VMS_PROJECT}
142+
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${NACL_VMS_PROJECT}
143143
CMAKE_GENERATOR ${VM_GENERATOR}
144144
CMAKE_ARGS
145145
-DFORK=2
@@ -154,10 +154,10 @@ function(gameSubProject)
154154
)
155155

156156
# Force the rescan and rebuild of the subproject.
157-
ExternalProject_Add_Step(${VMS_PROJECT} forcebuild
157+
ExternalProject_Add_Step(${NACL_VMS_PROJECT} forcebuild
158158
COMMAND ${CMAKE_COMMAND} -E remove
159-
${CMAKE_CURRENT_BINARY_DIR}/${VMS_PROJECT}-prefix/src/${VMS_PROJECT}-stamp/${VMS_PROJECT}-configure
160-
COMMENT "Forcing build step for '${VMS_PROJECT}'"
159+
${CMAKE_CURRENT_BINARY_DIR}/${NACL_VMS_PROJECT}-prefix/src/${NACL_VMS_PROJECT}-stamp/${NACL_VMS_PROJECT}-configure
160+
COMMENT "Forcing build step for '${NACL_VMS_PROJECT}'"
161161
DEPENDEES build
162162
ALWAYS 1
163163
)
@@ -201,7 +201,7 @@ function(GAMEMODULE)
201201
if (BUILD_GAME_NACL)
202202
if (USE_NACL_SAIGO)
203203
add_custom_target(nacl-vms ALL)
204-
unset(VMS_PROJECTS)
204+
unset(NACL_VMS_PROJECTS)
205205

206206
foreach(NACL_TARGET ${NACL_TARGETS})
207207
if (NACL_TARGET STREQUAL "i686")
@@ -214,9 +214,9 @@ function(GAMEMODULE)
214214
message(FATAL_ERROR "Unknown NaCl architecture ${NACL_TARGET}")
215215
endif()
216216

217-
set(VMS_PROJECT nacl-vms-${NACL_TARGET})
218-
list(APPEND VMS_PROJECTS ${VMS_PROJECT})
219-
add_dependencies(nacl-vms ${VMS_PROJECT})
217+
set(NACL_VMS_PROJECT nacl-vms-${NACL_TARGET})
218+
list(APPEND NACL_VMS_PROJECTS ${NACL_VMS_PROJECT})
219+
add_dependencies(nacl-vms ${NACL_VMS_PROJECT})
220220

221221
gameSubProject(
222222
-DCMAKE_TOOLCHAIN_FILE=${Daemon_SOURCE_DIR}/cmake/toolchain-saigo.cmake
@@ -229,8 +229,8 @@ function(GAMEMODULE)
229229
)
230230
endforeach()
231231
else()
232-
set(VMS_PROJECT nacl-vms)
233-
set(VMS_PROJECTS ${VMS_PROJECT})
232+
set(NACL_VMS_PROJECT nacl-vms)
233+
set(NACL_VMS_PROJECTS ${NACL_VMS_PROJECT})
234234

235235
# Workaround a bug where CMake ExternalProject lists-as-args are cut on first “;”
236236
string(REPLACE ";" "," NACL_TARGETS_STRING "${NACL_TARGETS}")
@@ -245,7 +245,7 @@ function(GAMEMODULE)
245245
endif()
246246
endif()
247247

248-
set(VMS_PROJECTS ${VMS_PROJECTS} PARENT_SCOPE)
248+
set(NACL_VMS_PROJECTS ${NACL_VMS_PROJECTS} PARENT_SCOPE)
249249
elseif (FORK EQUAL 2)
250250
if (BUILD_GAME_NACL)
251251
if (USE_NACL_SAIGO)

0 commit comments

Comments
 (0)