cmake: prefix ARCH and NACL_ARCH with DAEMON

Author: illwieckz

CMakeLists.txt

@@ -204,7 +204,7 @@ if (USE_EXTERNAL_DEPS AND NOT NACL)
 
     set(DEPS_EXT ".tar.xz")
 
-    set(DEPS_ARCH "${ARCH}")
+    set(DEPS_ARCH "${DAEMON_ARCH}")
 
     if (MSVC)
         set(DEPS_COMPILER msvc)
@@ -221,7 +221,7 @@ if (USE_EXTERNAL_DEPS AND NOT NACL)
         set(DEPS_SYSTEM macos)
         set(SUPPORTED_${DEPS_SYSTEM}_ARCH amd64)
 
-        if (ARCH STREQUAL arm64)
+        if (DAEMON_ARCH_arm64)
             set(DEPS_ARCH amd64)
 
             set_deps_dir()
@@ -681,10 +681,10 @@ if (BUILD_CLIENT OR WIN32)
     set(sdlvar_amd64 SDL_CPU_X64)
     set(sdlvar_armhf SDL_CPU_ARM32)
     set(sdlvar_arm64 SDL_CPU_ARM64)
-    if (sdlvar_${ARCH})
-        set(${sdlvar_${ARCH}} 1)
+    if (sdlvar_${DAEMON_ARCH})
+        set(${sdlvar_${DAEMON_ARCH}} 1)
     else()
-        message("Developer TODO: translate architecture ${ARCH} for SDL")
+        message("Developer TODO: translate architecture ${DAEMON_ARCH} for SDL")
     endif()
 
     find_package(SDL3 REQUIRED CONFIG)
@@ -974,13 +974,13 @@ if (DEPS_DIR AND HAS_NACL AND (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER
 
     add_custom_command(TARGET runtime_deps PRE_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            ${DEPS_DIR}/irt_core-${NACL_ARCH}.nexe
-            ${FULL_OUTPUT_DIR}/irt_core-${NACL_ARCH}.nexe
+            ${DEPS_DIR}/irt_core-${DAEMON_NACL_ARCH}.nexe
+            ${FULL_OUTPUT_DIR}/irt_core-${DAEMON_NACL_ARCH}.nexe
     )
 
     # Linux uses a bootstrap program to reserve address space
     if (LINUX OR FREEBSD)
-        if (ARCH STREQUAL "arm64")
+        if (DAEMON_ARCH_arm64)
             add_executable(nacl_helper_bootstrap-armhf tools/nacl_helper_bootstrap-armhf/nacl_helper_bootstrap-armhf.cpp)
             add_dependencies(runtime_deps nacl_helper_bootstrap-armhf)
 
@@ -1004,7 +1004,7 @@ if (DEPS_DIR AND HAS_NACL AND (BUILD_CLIENT OR BUILD_TTY_CLIENT OR BUILD_SERVER
     endif()
 
     # Win32 requires nacl_loader_amd64.exe in order to run on Win64
-    if (WIN32 AND ARCH STREQUAL i686)
+    if (WIN32 AND DAEMON_ARCH_i686)
         add_custom_command(TARGET runtime_deps PRE_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy_if_different
                 ${DEPS_DIR}/nacl_loader-amd64${CMAKE_EXECUTABLE_SUFFIX}

cmake/DaemonFlags.cmake

@@ -362,7 +362,7 @@ else()
 		endif()
 	endif()
 
-	if (NACL AND USE_NACL_SAIGO AND SAIGO_ARCH STREQUAL "arm")
+	if (NACL AND USE_NACL_SAIGO AND SAIGO_DAEMON_ARCH_arm)
 		# This should be set for every build type because build type flags
 		# are set after the other custom flags and then have the last word.
 		# DEBUG should already use -O0 anyway.
@@ -503,12 +503,12 @@ else()
 
 		if ("${FLAG_LINKER_PIE}" AND MINGW)
 			# https://github.com/msys2/MINGW-packages/issues/4100
-			if (ARCH STREQUAL "i686")
+			if (DAEMON_ARCH_i686)
 				set_linker_flag("-Wl,-e,_mainCRTStartup")
-			elseif(ARCH STREQUAL "amd64")
+			elseif(DAEMON_ARCH_amd64)
 				set_linker_flag("-Wl,-e,mainCRTStartup")
 			else()
-				message(FATAL_ERROR "Unsupported architecture ${ARCH}")
+				message(FATAL_ERROR "Unsupported architecture ${DAEMON_ARCH}")
 			endif()
 		endif()
 	endif()
@@ -578,7 +578,7 @@ option(USE_CPU_RECOMMENDED_FEATURES "Use some common hardware features like SSE2
 
 # Target options.
 if (MSVC)
-    if (ARCH STREQUAL "i686")
+    if (DAEMON_ARCH_i686)
         if (USE_CPU_RECOMMENDED_FEATURES)
             set_c_cxx_flag("/arch:SSE2") # This is the default
         else()
@@ -598,7 +598,7 @@ elseif (NOT NACL)
 	# Running a server with a native executable game is also a valid usage
 	# not requiring the NX bit.
 
-	if (ARCH STREQUAL "amd64")
+	if (DAEMON_ARCH_amd64)
 		# K8 or EM64T minimum: AMD Athlon 64 ClawHammer, Intel Xeon Nocona, Intel Pentium 4 model F (Prescott revision EO), VIA Nano.
 		if (DAEMON_CXX_COMPILER_ICC)
 			set(GCC_GENERIC_ARCH "pentium4")
@@ -608,15 +608,15 @@ elseif (NOT NACL)
 			set(GCC_GENERIC_ARCH "x86-64")
 		endif()
 		set(GCC_GENERIC_TUNE "generic")
-	elseif (ARCH STREQUAL "i686")
+	elseif (DAEMON_ARCH_i686)
 		# P6 or K6 minimum: Intel Pentium Pro, AMD K6, Via Cyrix III, Via C3.
 		set(GCC_GENERIC_ARCH "i686")
 		set(GCC_GENERIC_TUNE "generic")
-	elseif (ARCH STREQUAL "arm64")
+	elseif (DAEMON_ARCH_arm64)
 		# Armv8-A minimum: Cortex-A50.
 		set(GCC_GENERIC_ARCH "armv8-a")
 		set(GCC_GENERIC_TUNE "generic")
-	elseif (ARCH STREQUAL "armhf")
+	elseif (DAEMON_ARCH_armhf)
 		# Armv7-A minimum with VFPv3 and optional NEONv1: Cortex-A5.
 		# Hard float ABI (mainstream 32-bit ARM Linux distributions).
 		# An FPU should be explicitly set on recent compilers or this
@@ -625,15 +625,15 @@ elseif (NOT NACL)
 		#   lacks an FPU
 		set(GCC_GENERIC_ARCH "armv7-a+fp")
 		set(GCC_GENERIC_TUNE "generic-armv7-a")
-	elseif (ARCH STREQUAL "armel")
+	elseif (DAEMON_ARCH_armel)
 		# Armv6 minimum with optional VFP: ARM11.
 		# Soft float ABI (previous mainstream 32-bit ARM Linux
 		# distributions, mainstream 32-bit ARM Android distributions).
 		set(GCC_GENERIC_ARCH "armv6")
 		# There is no generic tuning option for armv6.
 		unset(GCC_GENERIC_TUNE)
 	else()
-		message(WARNING "Unknown architecture ${ARCH}")
+		message(WARNING "Unknown architecture ${DAEMON_ARCH}")
 	endif()
 
 	if ("${DAEMON_CXX_COMPILER_NAME}" STREQUAL "Zig")
@@ -652,18 +652,18 @@ elseif (NOT NACL)
 	endif()
 
 	if (USE_CPU_RECOMMENDED_FEATURES)
-		if (ARCH STREQUAL "amd64")
+		if (DAEMON_ARCH_amd64)
 			# CMPXCHG16B minimum (x86-64-v2): AMD64 revision F.
 			try_c_cxx_flag_werror(MCX16 "-mcx16")
-		elseif (ARCH STREQUAL "i686")
+		elseif (DAEMON_ARCH_i686)
 			# SSE2 minimum: Intel Pentium 4 (Prescott),
 			# Intel Pentium M (Banias), AMD K8, Via C7.
 			try_c_cxx_flag_werror(MSSE2 "-msse2")
 			try_c_cxx_flag_werror(MFPMATH_SSE "-mfpmath=sse")
-		elseif (ARCH STREQUAL "armhf")
+		elseif (DAEMON_ARCH_armhf)
 			# NEONv1 minimum.
 			try_c_cxx_flag_werror(MFPU_NEON "-mfpu=neon")
-		elseif (ARCH STREQUAL "armel")
+		elseif (DAEMON_ARCH_armel)
 			# VFP minimum, hard float with soft float ABI.
 			try_c_cxx_flag_werror(MFPU_VFP "-mfpu=vfp")
 			try_c_cxx_flag_werror(MFLOAT_ABI_SOFTFP "-mfloat-abi=softfp")

cmake/DaemonGame.cmake

@@ -70,7 +70,7 @@ include(CMakeParseArguments)
 # The NaCl SDK only runs on amd64 or i686.
 if (NOT FORK EQUAL 2)
 	if (CMAKE_SYSTEM_NAME STREQUAL CMAKE_HOST_SYSTEM_NAME
-	AND (ARCH STREQUAL "amd64" OR ARCH STREQUAL "i686"))
+	AND (DAEMON_ARCH_amd64 OR DAEMON_ARCH_i686))
 		# can be loaded by daemon with vm.[sc]game.type 0 or 1
 		option(BUILD_GAME_NACL "Build the NaCl \"pexe\" and \"nexe\" gamelogic modules for enabled architecture targets, required to host mods." OFF)
 
@@ -81,7 +81,7 @@ if (NOT FORK EQUAL 2)
 		if (BUILD_GAME_NACL_TARGETS STREQUAL "all")
 			set(NACL_TARGETS "${NACL_ALL_TARGETS}")
 		elseif (BUILD_GAME_NACL_TARGETS STREQUAL "native")
-			set(NACL_TARGETS "${ARCH}")
+			set(NACL_TARGETS "${DAEMON_ARCH}")
 		elseif (BUILD_GAME_NACL_TARGETS STREQUAL "none")
 			set(NACL_TARGETS "")
 		else()

cmake/DaemonNacl.cmake

@@ -31,7 +31,7 @@ option(USE_NACL_SAIGO "Use Saigo toolchain to build NaCl executables" OFF)
 if( NACL )
   # Build nexe binary.
   if(USE_NACL_SAIGO)
-    # NACL_ARCH is "pnacl" here, NACL_TARGET carries the architecture.
+    # DAEMON_NACL_ARCH is "pnacl" here, NACL_TARGET carries the architecture.
     if (NACL_TARGET STREQUAL "amd64")
       add_definitions(-DNACL_BUILD_ARCH=x86)
       add_definitions(-DNACL_BUILD_SUBARCH=64)
@@ -47,7 +47,7 @@ if( NACL )
     # Those defines looks to be meaningless to produce arch-independent pexe
     # with PNaCl but they must be set to anything supported by native builds.
     # This requirement looks to be a PNaCl bug.
-    # NACL_ARCH is "pnacl" here, NACL_TARGET is not set.
+    # DAEMON_NACL_ARCH is "pnacl" here, NACL_TARGET is not set.
     add_definitions( -DNACL_BUILD_ARCH=x86 )
     add_definitions( -DNACL_BUILD_SUBARCH=64 )
   endif()
@@ -63,16 +63,16 @@ else()
     add_definitions( -DNACL_WINDOWS=1 -DNACL_LINUX=0 -DNACL_ANDROID=0 -DNACL_FREEBSD=0 -DNACL_OSX=0 )
   endif()
 
-  if( NACL_ARCH STREQUAL "amd64" )
+  if (DAEMON_NACL_ARCH_amd64)
     add_definitions( -DNACL_BUILD_ARCH=x86 )
     add_definitions( -DNACL_BUILD_SUBARCH=64 )
-  elseif( NACL_ARCH STREQUAL "i686" )
+  elseif (DAEMON_NACL_ARCH_i686)
     add_definitions( -DNACL_BUILD_ARCH=x86 )
     add_definitions( -DNACL_BUILD_SUBARCH=32 )
-  elseif( NACL_ARCH STREQUAL "armhf" )
+  elseif (DAEMON_NACL_ARCH_armhf)
     add_definitions( -DNACL_BUILD_ARCH=arm )
   else()
-    message(WARNING "Unknown architecture ${NACL_ARCH}")
+    message(WARNING "Unknown architecture ${DAEMON_NACL_ARCH}")
   endif()
 endif()
 

cmake/DaemonPlatform/Architecture.cmake

@@ -52,42 +52,46 @@ if (NOT BUILD_RESULT)
 	)
 endif()
 
-string(REGEX MATCH "DAEMON_ARCH_([a-zA-Z0-9_]+)" ARCH_DEFINE "${BUILD_LOG}")
-string(REPLACE "DAEMON_ARCH_" "" ARCH "${ARCH_DEFINE}")
+string(REGEX MATCH "DAEMON_ARCH_([a-zA-Z0-9_]+)" DAEMON_ARCH_DEFINE "${BUILD_LOG}")
+string(REPLACE "DAEMON_ARCH_" "" DAEMON_ARCH "${DAEMON_ARCH_DEFINE}")
 
-if (NOT ARCH)
+set("DAEMON_ARCH_${DAEMON_ARCH}" ON)
+
+if (NOT DAEMON_ARCH)
 	message(FATAL_ERROR
 		"Missing DAEMON_ARCH, there is a mistake in Architecture.cpp\n"
 		"${BUILD_LOG}"
 	)
 endif()
 
-message(STATUS "Detected target architecture: ${ARCH}")
+message(STATUS "Detected target architecture: ${DAEMON_ARCH}")
 
-add_definitions(-D${ARCH_DEFINE})
+add_definitions(-D${DAEMON_ARCH_DEFINE})
 
 # This string can be modified without breaking compatibility.
-daemon_add_buildinfo("char*" "DAEMON_ARCH_STRING" "\"${ARCH}\"")
+daemon_add_buildinfo("char*" "DAEMON_ARCH_STRING" "\"${DAEMON_ARCH}\"")
 
 # Modifying NACL_ARCH breaks engine compatibility with nexe game binaries
 # since NACL_ARCH contributes to the nexe file name.
-set(NACL_ARCH "${ARCH}")
+set(DAEMON_NACL_ARCH "${DAEMON_ARCH}")
 if (LINUX OR FREEBSD)
 	set(ARMHF_USAGE arm64 armel)
-	if (ARCH IN_LIST ARMHF_USAGE)
+	if (DAEMON_ARCH IN_LIST ARMHF_USAGE)
 		# Load 32-bit armhf nexe on 64-bit arm64 engine on Linux with multiarch.
 		# The nexe is system agnostic so there should be no difference with armel.
-		set(NACL_ARCH "armhf")
+		set(DAEMON_NACL_ARCH "armhf")
 	endif()
 elseif(APPLE)
-	if ("${ARCH}" STREQUAL arm64)
+	if ("${DAEMON_ARCH}" STREQUAL arm64)
 		# You can get emulated NaCl going like this:
 		# cp external_deps/macos-amd64-default_10/{nacl_loader,irt_core-amd64.nexe} build/
-		set(NACL_ARCH "amd64")
+		set(DAEMON_NACL_ARCH "amd64")
 	endif()
 endif()
 
-daemon_add_buildinfo("char*" "DAEMON_NACL_ARCH_STRING" "\"${NACL_ARCH}\"")
+set("DAEMON_NACL_ARCH_${DAEMON_NACL_ARCH}" ON)
+
+daemon_add_buildinfo("char*" "DAEMON_NACL_ARCH_STRING" "\"${DAEMON_NACL_ARCH}\"")
 
 option(USE_ARCH_INTRINSICS "Enable custom code using intrinsics functions or asm declarations" ON)
 mark_as_advanced(USE_ARCH_INTRINSICS)
@@ -105,11 +109,11 @@ if (USE_ARCH_INTRINSICS)
     add_definitions(-DDAEMON_USE_ARCH_INTRINSICS=1)
 endif()
 
-set_arch_intrinsics(${ARCH})
+set_arch_intrinsics(${DAEMON_ARCH})
 
 set(amd64_PARENT "i686")
 set(arm64_PARENT "armhf")
 
-if (${ARCH}_PARENT)
-	set_arch_intrinsics(${${ARCH}_PARENT})
+if (${DAEMON_ARCH}_PARENT)
+	set_arch_intrinsics(${${DAEMON_ARCH}_PARENT})
 endif()