Skip to content

Commit f1a3b06

Browse files
committed
Make NACL_VMS_PROJECTS accessible to outer scope
Also remove duplicative nacl-vms-pexe target.
1 parent ffd8d2a commit f1a3b06

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

cmake/DaemonGame.cmake

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,8 @@ function(GAMEMODULE)
7777
"-D${inherited_option}=${${inherited_option}}")
7878
endforeach(inherited_option)
7979

80-
add_custom_target(nacl-vms ALL)
81-
8280
if (USE_NACL_SAIGO)
81+
add_custom_target(nacl-vms ALL)
8382
unset(NACL_VMS_PROJECTS)
8483

8584
foreach(NACL_TARGET ${NACL_TARGETS})
@@ -129,9 +128,8 @@ function(GAMEMODULE)
129128
)
130129
endforeach()
131130
else()
132-
set(NACL_VMS_PROJECT nacl-vms-pexe)
131+
set(NACL_VMS_PROJECT nacl-vms)
133132
set(NACL_VMS_PROJECTS ${NACL_VMS_PROJECT})
134-
add_dependencies(nacl-vms ${NACL_VMS_PROJECT})
135133

136134
# Workaround a bug where CMake ExternalProject lists-as-args are cut on first “;”
137135
string(REPLACE ";" "," NACL_TARGETS_STRING "${NACL_TARGETS}")
@@ -165,6 +163,7 @@ function(GAMEMODULE)
165163
ALWAYS 1
166164
)
167165
endif()
166+
set(NACL_VMS_PROJECTS ${NACL_VMS_PROJECTS} PARENT_SCOPE)
168167
endif()
169168
else()
170169
if (FORK EQUAL 2)

0 commit comments

Comments
 (0)