Skip to content

Commit b0c63f7

Browse files
committed
cmake/DaemonGame: do not reset BUILD_GAME_NACL in cmake subproject
Fixup for #1555
1 parent efe1863 commit b0c63f7

File tree

1 file changed

+33
-31
lines changed

1 file changed

+33
-31
lines changed

cmake/DaemonGame.cmake

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -68,40 +68,42 @@ set(SHAREDLIST_sgame
6868
include(CMakeParseArguments)
6969

7070
# The NaCl SDK only runs on amd64 or i686.
71-
if (CMAKE_SYSTEM_NAME STREQUAL CMAKE_HOST_SYSTEM_NAME
72-
AND (ARCH STREQUAL "amd64" OR ARCH STREQUAL "i686"))
73-
# can be loaded by daemon with vm.[sc]game.type 0 or 1
74-
option(BUILD_GAME_NACL "Build the NaCl \"pexe\" and \"nexe\" gamelogic modules for enabled architecture targets, required to host mods." OFF)
75-
76-
set(NACL_ALL_TARGETS "amd64;i686;armhf")
77-
set(BUILD_GAME_NACL_TARGETS "all" CACHE STRING "Enabled NaCl \"nexe\" architecture targets, values: ${NACL_ALL_TARGETS}, all, native, none.")
78-
mark_as_advanced(BUILD_GAME_NACL_TARGETS)
79-
80-
if (BUILD_GAME_NACL_TARGETS STREQUAL "all")
81-
set(NACL_TARGETS "${NACL_ALL_TARGETS}")
82-
elseif (BUILD_GAME_NACL_TARGETS STREQUAL "native")
83-
set(NACL_TARGETS "${ARCH}")
84-
elseif (BUILD_GAME_NACL_TARGETS STREQUAL "none")
85-
set(NACL_TARGETS "")
86-
else()
87-
set(NACL_TARGETS "${BUILD_GAME_NACL_TARGETS}")
88-
endif()
71+
if (NOT FORK EQUAL 2)
72+
if (CMAKE_SYSTEM_NAME STREQUAL CMAKE_HOST_SYSTEM_NAME
73+
AND (ARCH STREQUAL "amd64" OR ARCH STREQUAL "i686"))
74+
# can be loaded by daemon with vm.[sc]game.type 0 or 1
75+
option(BUILD_GAME_NACL "Build the NaCl \"pexe\" and \"nexe\" gamelogic modules for enabled architecture targets, required to host mods." OFF)
76+
77+
set(NACL_ALL_TARGETS "amd64;i686;armhf")
78+
set(BUILD_GAME_NACL_TARGETS "all" CACHE STRING "Enabled NaCl \"nexe\" architecture targets, values: ${NACL_ALL_TARGETS}, all, native, none.")
79+
mark_as_advanced(BUILD_GAME_NACL_TARGETS)
80+
81+
if (BUILD_GAME_NACL_TARGETS STREQUAL "all")
82+
set(NACL_TARGETS "${NACL_ALL_TARGETS}")
83+
elseif (BUILD_GAME_NACL_TARGETS STREQUAL "native")
84+
set(NACL_TARGETS "${ARCH}")
85+
elseif (BUILD_GAME_NACL_TARGETS STREQUAL "none")
86+
set(NACL_TARGETS "")
87+
else()
88+
set(NACL_TARGETS "${BUILD_GAME_NACL_TARGETS}")
89+
endif()
90+
91+
foreach(NACL_TARGET ${NACL_TARGETS})
92+
set(IS_NACL_VALID_TARGET OFF)
93+
foreach(NACL_VALID_TARGET ${NACL_ALL_TARGETS})
94+
if(NACL_TARGET STREQUAL NACL_VALID_TARGET)
95+
set(IS_NACL_VALID_TARGET ON)
96+
endif()
97+
endforeach()
8998

90-
foreach(NACL_TARGET ${NACL_TARGETS})
91-
set(IS_NACL_VALID_TARGET OFF)
92-
foreach(NACL_VALID_TARGET ${NACL_ALL_TARGETS})
93-
if(NACL_TARGET STREQUAL NACL_VALID_TARGET)
94-
set(IS_NACL_VALID_TARGET ON)
99+
if (NOT IS_NACL_VALID_TARGET)
100+
message(FATAL_ERROR "Invalid NaCl target ${NACL_TARGET}, must be one of ${NACL_ALL_TARGETS}")
95101
endif()
96102
endforeach()
97-
98-
if (NOT IS_NACL_VALID_TARGET)
99-
message(FATAL_ERROR "Invalid NaCl target ${NACL_TARGET}, must be one of ${NACL_ALL_TARGETS}")
100-
endif()
101-
endforeach()
102-
else()
103-
set(BUILD_GAME_NACL OFF)
104-
set(NACL_TARGETS "")
103+
else()
104+
set(BUILD_GAME_NACL OFF)
105+
set(NACL_TARGETS "")
106+
endif()
105107
endif()
106108

107109
daemon_write_buildinfo("Game")

0 commit comments

Comments
 (0)