cmake: unify the wording of Platform detected names

Author: illwieckz

CMakeLists.txt

@@ -204,7 +204,7 @@ if (USE_EXTERNAL_DEPS AND NOT DAEMON_SYSTEM_NaCl)
 
     set(DEPS_EXT ".tar.xz")
 
-    set(DEPS_ARCH "${DAEMON_ARCH}")
+    set(DEPS_ARCH "${DAEMON_ARCH_NAME}")
 
     if (DAEMON_CXX_COMPILER_MSVC)
         set(DEPS_COMPILER msvc)
@@ -681,10 +681,10 @@ if (BUILD_CLIENT OR DAEMON_SYSTEM_Windows)
     set(sdlvar_amd64 SDL_CPU_X64)
     set(sdlvar_armhf SDL_CPU_ARM32)
     set(sdlvar_arm64 SDL_CPU_ARM64)
-    if (sdlvar_${DAEMON_ARCH})
-        set(${sdlvar_${DAEMON_ARCH}} 1)
+    if (sdlvar_${DAEMON_ARCH_NAME})
+        set(${sdlvar_${DAEMON_ARCH_NAME}} 1)
     else()
-        message("Developer TODO: translate architecture ${DAEMON_ARCH} for SDL")
+        message("Developer TODO: translate architecture ${DAEMON_ARCH_NAME} for SDL")
     endif()
 
     find_package(SDL3 REQUIRED CONFIG)
@@ -974,8 +974,8 @@ 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-${DAEMON_NACL_ARCH}.nexe
-            ${FULL_OUTPUT_DIR}/irt_core-${DAEMON_NACL_ARCH}.nexe
+            ${DEPS_DIR}/irt_core-${DAEMON_NACL_ARCH_NAME}.nexe
+            ${FULL_OUTPUT_DIR}/irt_core-${DAEMON_NACL_ARCH_NAME}.nexe
     )
 
     # Linux uses a bootstrap program to reserve address space

cmake/DaemonFlags.cmake

@@ -508,7 +508,7 @@ else()
 			elseif(DAEMON_ARCH_amd64)
 				set_linker_flag("-Wl,-e,mainCRTStartup")
 			else()
-				message(FATAL_ERROR "Unsupported architecture ${DAEMON_ARCH}")
+				message(FATAL_ERROR "Unsupported architecture ${DAEMON_ARCH_NAME}")
 			endif()
 		endif()
 	endif()
@@ -633,7 +633,7 @@ elseif (NOT DAEMON_SYSTEM_NaCl)
 		# There is no generic tuning option for armv6.
 		unset(GCC_GENERIC_TUNE)
 	else()
-		message(WARNING "Unknown architecture ${DAEMON_ARCH}")
+		message(WARNING "Unknown architecture ${DAEMON_ARCH_NAME}")
 	endif()
 
 	if ("${DAEMON_CXX_COMPILER_NAME}" STREQUAL "Zig")

cmake/DaemonGame.cmake

@@ -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 "${DAEMON_ARCH}")
+			set(NACL_TARGETS "${DAEMON_ARCH_NAME}")
 		elseif (BUILD_GAME_NACL_TARGETS STREQUAL "none")
 			set(NACL_TARGETS "")
 		else()

cmake/DaemonNacl.cmake

@@ -72,7 +72,7 @@ else()
   elseif (DAEMON_NACL_ARCH_armhf)
     add_definitions( -DNACL_BUILD_ARCH=arm )
   else()
-    message(WARNING "Unknown architecture ${DAEMON_NACL_ARCH}")
+    message(WARNING "Unknown NaCl architecture ${DAEMON_NACL_ARCH_NAME}")
   endif()
 endif()
 

cmake/DaemonPlatform/Architecture.cmake

@@ -36,7 +36,7 @@ mark_as_advanced(USE_ARCH_INTRINSICS)
 function(daemon_detect_arch)
 	daemon_run_detection("" "ARCH" "Architecture.c" "")
 
-	set(DAEMON_ARCH "${arch_name}" PARENT_SCOPE)
+	set(DAEMON_ARCH_NAME "${arch_name}" PARENT_SCOPE)
 
 	message(STATUS "Detected target architecture: ${arch_name}")
 
@@ -59,7 +59,7 @@ function(daemon_detect_arch)
 	endif()
 
 	# The DAEMON_NACL_ARCH variable contributes to the nexe file name.
-	set(DAEMON_NACL_ARCH "${nacl_arch}" PARENT_SCOPE)
+	set(DAEMON_NACL_ARCH_NAME "${nacl_arch}" PARENT_SCOPE)
 endfunction()
 
 function(daemon_set_arch_intrinsics name)
@@ -76,16 +76,16 @@ function(daemon_set_intrinsics)
 		# Makes possible to do that in C++ code:
 		# > if defined(DAEMON_USER_ARCH_INTRINSICS_amd64)
 		# > if defined(DAEMON_USER_ARCH_INTRINSICS_i686)
-		daemon_set_arch_intrinsics("${DAEMON_ARCH}")
+		daemon_set_arch_intrinsics("${DAEMON_ARCH_NAME}")
 
 		set(amd64_PARENT "i686")
 		set(arm64_PARENT "armhf")
 
-		if ("${DAEMON_ARCH}_PARENT")
-			daemon_set_arch_intrinsics("${${DAEMON_ARCH}_PARENT}")
+		if ("${DAEMON_ARCH_NAME}_PARENT")
+			daemon_set_arch_intrinsics("${${DAEMON_ARCH_NAME}_PARENT}")
 		endif()
 	else()
-		message(STATUS "Disabling ${DAEMON_ARCH} architecture intrinsics")
+		message(STATUS "Disabling ${DAEMON_ARCH_NAME} architecture intrinsics")
 	endif()
 endfunction()
 
@@ -95,11 +95,11 @@ daemon_set_intrinsics()
 # Makes possible to do that in CMake code:
 # > if (DAEMON_ARCH_arm64)
 # > if (DAEMON_NACL_ARCH_armhf)
-set("DAEMON_ARCH_${DAEMON_ARCH}" ON)
-set("DAEMON_NACL_ARCH_${DAEMON_NACL_ARCH}" ON)
+set("DAEMON_ARCH_${DAEMON_ARCH_NAME}" ON)
+set("DAEMON_NACL_ARCH_${DAEMON_NACL_ARCH_NAME}" ON)
 
 if (DAEMON_SOURCE_GENERATOR)
 	# Add printable strings to the executable.
-	daemon_add_buildinfo("char*" "DAEMON_ARCH_STRING" "\"${DAEMON_ARCH}\"")
-	daemon_add_buildinfo("char*" "DAEMON_NACL_ARCH_STRING" "\"${DAEMON_NACL_ARCH}\"")
+	daemon_add_buildinfo("char*" "DAEMON_ARCH_STRING" "\"${DAEMON_ARCH_NAME}\"")
+	daemon_add_buildinfo("char*" "DAEMON_NACL_ARCH_STRING" "\"${DAEMON_NACL_ARCH_NAME}\"")
 endif()