mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-07-25 14:32:27 +00:00
Ralph Sennhauser
263b481442
Fix nvtt build to support cmake-4, while at it also fix other related outstanding cmake issues in nvtt. Fixes: #7538 Fixes: #7764 Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
27 lines
1.0 KiB
Diff
27 lines
1.0 KiB
Diff
From 324f50d1ccf5ca38e0f3817c8d18208bd72e01f2 Mon Sep 17 00:00:00 2001
|
|
From: Ralph Sennhauser <ralph.sennhauser@gmail.com>
|
|
Date: Sun, 27 Apr 2025 08:05:59 +0200
|
|
Subject: [PATCH] Use execute_process insted of exec_program
|
|
|
|
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
|
|
---
|
|
src/cmake/DetermineProcessor.cmake | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/cmake/DetermineProcessor.cmake b/src/cmake/DetermineProcessor.cmake
|
|
index 7db7a95..13d39de 100644
|
|
--- a/src/cmake/DetermineProcessor.cmake
|
|
+++ b/src/cmake/DetermineProcessor.cmake
|
|
@@ -8,7 +8,7 @@ IF(UNIX)
|
|
#EXEC_PROGRAM(uname ARGS -p OUTPUT_VARIABLE NV_SYSTEM_PROCESSOR RETURN_VALUE val)
|
|
|
|
#IF("${val}" GREATER 0 OR NV_SYSTEM_PROCESSOR STREQUAL "unknown")
|
|
- EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE NV_SYSTEM_PROCESSOR RETURN_VALUE val)
|
|
+ execute_process(COMMAND uname -m OUTPUT_VARIABLE NV_SYSTEM_PROCESSOR ERROR_VARIABLE val)
|
|
#ENDIF("${val}" GREATER 0 OR NV_SYSTEM_PROCESSOR STREQUAL "unknown")
|
|
|
|
IF(NV_SYSTEM_PROCESSOR STREQUAL "Power Macintosh")
|
|
--
|
|
2.49.0
|
|
|