depends: Rename cmake_system > cmake_system_name

hebasto · May 20, 2024 · 6ff697a · 6ff697a
1 parent a856151
commit 6ff697a
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/depends/Makefile b/depends/Makefile
@@ -267,7 +267,7 @@ endif
 $(host_prefix)/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_$(final_build_id)
 	@mkdir -p $(@D)
 	sed -e 's|@depends_crosscompiling@|$(crosscompiling)|' \
-            -e 's|@host_system@|$($(host_os)_cmake_system)|' \
+            -e 's|@host_system_name@|$($(host_os)_cmake_system_name)|' \
             -e 's|@host_arch@|$(host_arch)|' \
             -e 's|@CC@|$(host_CC)|' \
             -e 's|@CXX@|$(host_CXX)|' \

diff --git a/depends/funcs.mk b/depends/funcs.mk
@@ -187,7 +187,7 @@ ifeq ($($(1)_type),build)
 $(1)_cmake += -DCMAKE_INSTALL_RPATH:PATH="$$($($(1)_type)_prefix)/lib"
 else
 ifneq ($(host),$(build))
-$(1)_cmake += -DCMAKE_SYSTEM_NAME=$($(host_os)_cmake_system)
+$(1)_cmake += -DCMAKE_SYSTEM_NAME=$($(host_os)_cmake_system_name)
 $(1)_cmake += -DCMAKE_C_COMPILER_TARGET=$(host)
 $(1)_cmake += -DCMAKE_CXX_COMPILER_TARGET=$(host)
 endif

diff --git a/depends/hosts/android.mk b/depends/hosts/android.mk
@@ -12,4 +12,4 @@ android_CXXFLAGS=-std=$(CXX_STANDARD)
 android_AR=$(ANDROID_TOOLCHAIN_BIN)/llvm-ar
 android_RANLIB=$(ANDROID_TOOLCHAIN_BIN)/llvm-ranlib
 
-android_cmake_system=Android
+android_cmake_system_name=Android
diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk
@@ -108,4 +108,4 @@ darwin_release_CXXFLAGS=$(darwin_release_CFLAGS)
 darwin_debug_CFLAGS=-O1 -g
 darwin_debug_CXXFLAGS=$(darwin_debug_CFLAGS)
 
-darwin_cmake_system=Darwin
+darwin_cmake_system_name=Darwin
diff --git a/depends/hosts/freebsd.mk b/depends/hosts/freebsd.mk
@@ -28,4 +28,4 @@ x86_64_freebsd_CC=$(default_host_CC) -m64
 x86_64_freebsd_CXX=$(default_host_CXX) -m64
 endif
 
-freebsd_cmake_system=FreeBSD
+freebsd_cmake_system_name=FreeBSD
diff --git a/depends/hosts/linux.mk b/depends/hosts/linux.mk
@@ -39,4 +39,4 @@ i686_linux_CXX=$(default_host_CXX) -m32
 x86_64_linux_CC=$(default_host_CC) -m64
 x86_64_linux_CXX=$(default_host_CXX) -m64
 endif
-linux_cmake_system=Linux
+linux_cmake_system_name=Linux
diff --git a/depends/hosts/mingw32.mk b/depends/hosts/mingw32.mk
@@ -19,4 +19,4 @@ mingw32_debug_CXXFLAGS=$(mingw32_debug_CFLAGS)
 
 mingw32_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC
 
-mingw32_cmake_system=Windows
+mingw32_cmake_system_name=Windows
diff --git a/depends/hosts/netbsd.mk b/depends/hosts/netbsd.mk
@@ -36,4 +36,4 @@ x86_64_netbsd_CC=$(default_host_CC) -m64
 x86_64_netbsd_CXX=$(default_host_CXX) -m64
 endif
 
-netbsd_cmake_system=NetBSD
+netbsd_cmake_system_name=NetBSD
diff --git a/depends/hosts/openbsd.mk b/depends/hosts/openbsd.mk
@@ -28,4 +28,4 @@ x86_64_openbsd_CC=$(default_host_CC) -m64
 x86_64_openbsd_CXX=$(default_host_CXX) -m64
 endif
 
-openbsd_cmake_system=OpenBSD
+openbsd_cmake_system_name=OpenBSD
diff --git a/depends/toolchain.cmake.in b/depends/toolchain.cmake.in
@@ -10,7 +10,7 @@
 # it is best not to touch CMAKE_SYSTEM_NAME unless cross-compiling is
 # intended.
 if(@depends_crosscompiling@)
-  set(CMAKE_SYSTEM_NAME @host_system@)
+  set(CMAKE_SYSTEM_NAME @host_system_name@)
   set(CMAKE_SYSTEM_PROCESSOR @host_arch@)
 endif()