Skip to content

Commit 4e1fdbd

Browse files
committed
fixup: cmake: set variables before using them
1 parent 328e89e commit 4e1fdbd

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

cmake/DaemonGame.cmake

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,6 @@
2626

2727
include_directories(${MOUNT_DIR} ${LIB_DIR} ${LIB_DIR}/zlib)
2828

29-
# Do not report unused native compiler if native vms are not built.
30-
# If only NACL vms are built, this will be reported in chainloaded build.
31-
if (BUILD_GAME_NATIVE_DLL OR BUILD_GAME_NATIVE_EXE OR NACL)
32-
include(DaemonPlatform)
33-
include(DaemonNacl)
34-
include(DaemonFlags)
35-
endif()
36-
37-
# Function to setup all the Sgame/Cgame libraries
38-
include(CMakeParseArguments)
39-
4029
## About the different ways to host/play games:
4130
## Native DLL: no sandboxing, no cleaning up but debugger support. Use for dev.
4231
## NaCl exe: sandboxing, no leaks, slightly slower, hard to debug. Use for regular players.
@@ -49,6 +38,18 @@ option(BUILD_GAME_NATIVE_DLL "Build the shared library files, mostly useful for
4938
# can be loaded by daemon with vm.[sc]game.type 2
5039
option(BUILD_GAME_NATIVE_EXE "Build native executable, which might be used for better performances by server owners" OFF)
5140

41+
include(DaemonPlatform)
42+
43+
# Do not report unused native compiler if native vms are not built.
44+
# If only NACL vms are built, this will be reported in chainloaded build.
45+
if (BUILD_GAME_NATIVE_DLL OR BUILD_GAME_NATIVE_EXE OR NACL)
46+
include(DaemonNacl)
47+
include(DaemonFlags)
48+
endif()
49+
50+
# Function to setup all the Sgame/Cgame libraries
51+
include(CMakeParseArguments)
52+
5253
# The NaCl SDK only runs on amd64 or i686.
5354
if (CMAKE_SYSTEM_NAME STREQUAL CMAKE_HOST_SYSTEM_NAME
5455
AND (ARCH STREQUAL "amd64" OR ARCH STREQUAL "i686"))

0 commit comments

Comments
 (0)