From a8d118ce2824f33c50311cf163c1eb586a8046a5 Mon Sep 17 00:00:00 2001 From: Christopher Degawa Date: Wed, 12 Feb 2025 11:54:08 -0600 Subject: [PATCH] cmake: rename duplicate names Xcode on macOS cannot handle multiple .c files having the same name as it produces an object file like init-.o, but tries to link to init.o https://gitlab.kitware.com/cmake/cmake/-/issues/20501 Signed-off-by: Christopher Degawa --- CMakeLists.txt | 8 ++++---- src/{init.c => maininit.c} | 0 src/x86/cache/{init.c => cacheinit.c} | 0 src/x86/{init.c => x86init.c} | 0 src/x86/{topology.c => x86topology.c} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename src/{init.c => maininit.c} (100%) rename src/x86/cache/{init.c => cacheinit.c} (100%) rename src/x86/{init.c => x86init.c} (100%) rename src/x86/{topology.c => x86topology.c} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index aedc9831..be12f858 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,19 +158,19 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_BENCHMARKS) ENDIF() # ---[ cpuinfo library -SET(CPUINFO_SRCS src/api.c src/cache.c src/init.c src/log.c) +SET(CPUINFO_SRCS src/api.c src/cache.c src/maininit.c src/log.c) IF(CPUINFO_SUPPORTED_PLATFORM) IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten" AND (CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86(_64)?)$" OR IOS_ARCH MATCHES "^(i386|x86_64)$")) LIST(APPEND CPUINFO_SRCS - src/x86/init.c + src/x86/x86init.c src/x86/info.c src/x86/vendor.c src/x86/uarch.c src/x86/name.c - src/x86/topology.c + src/x86/x86topology.c src/x86/isa.c - src/x86/cache/init.c + src/x86/cache/cacheinit.c src/x86/cache/descriptor.c src/x86/cache/deterministic.c) IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android") diff --git a/src/init.c b/src/maininit.c similarity index 100% rename from src/init.c rename to src/maininit.c diff --git a/src/x86/cache/init.c b/src/x86/cache/cacheinit.c similarity index 100% rename from src/x86/cache/init.c rename to src/x86/cache/cacheinit.c diff --git a/src/x86/init.c b/src/x86/x86init.c similarity index 100% rename from src/x86/init.c rename to src/x86/x86init.c diff --git a/src/x86/topology.c b/src/x86/x86topology.c similarity index 100% rename from src/x86/topology.c rename to src/x86/x86topology.c