From 4d2c1004e96faad1179591b4409a75965af43985 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Wed, 8 Feb 2023 11:00:16 +0100
Subject: build: prefer -D <variable>=<value> over -D<variable>=<value>
 (#22164)

This makes it easier to see that -D is referring to the entire
"<variable>=<value>", rather than only <variable>. It also help syntax
highlighters highlight built-in variables.
---
 cmake.deps/cmake/BuildGettext.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cmake.deps/cmake/BuildGettext.cmake')

diff --git a/cmake.deps/cmake/BuildGettext.cmake b/cmake.deps/cmake/BuildGettext.cmake
index 1f9fd38702..31d84b76e4 100644
--- a/cmake.deps/cmake/BuildGettext.cmake
+++ b/cmake.deps/cmake/BuildGettext.cmake
@@ -11,8 +11,8 @@ if(MSVC)
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/GettextCMakeLists.txt
       ${DEPS_BUILD_DIR}/src/gettext/CMakeLists.txt
     CMAKE_ARGS ${DEPS_CMAKE_ARGS}
-      -DLIBICONV_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
-      -DLIBICONV_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libcharset${CMAKE_STATIC_LIBRARY_SUFFIX}$<SEMICOLON>${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libiconv${CMAKE_STATIC_LIBRARY_SUFFIX}
+      -D LIBICONV_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
+      -D LIBICONV_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libcharset${CMAKE_STATIC_LIBRARY_SUFFIX}$<SEMICOLON>${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libiconv${CMAKE_STATIC_LIBRARY_SUFFIX}
     CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
 else()
   message(FATAL_ERROR "Trying to build gettext in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
-- 
cgit 


From 5ffd3d035dfd3d7f6e66edbaa895b98792ba3de3 Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Sun, 19 Feb 2023 21:11:27 +0100
Subject: build: build all dependencies in parallel (#22329)

Previously, all targets were connected in one main target called
third-party in order to remove any potentially conflicting shared
library. We can make each dependency target independent of each other by
only removing shared libraries from luajit and msgpack in their own
targets, as only these has unwanted shared libraries.
---
 cmake.deps/cmake/BuildGettext.cmake | 1 -
 1 file changed, 1 deletion(-)

(limited to 'cmake.deps/cmake/BuildGettext.cmake')

diff --git a/cmake.deps/cmake/BuildGettext.cmake b/cmake.deps/cmake/BuildGettext.cmake
index 31d84b76e4..7db7d5e4fe 100644
--- a/cmake.deps/cmake/BuildGettext.cmake
+++ b/cmake.deps/cmake/BuildGettext.cmake
@@ -18,7 +18,6 @@ else()
   message(FATAL_ERROR "Trying to build gettext in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
 endif()
 
-list(APPEND THIRD_PARTY_DEPS gettext)
 if(USE_BUNDLED_LIBICONV)
   add_dependencies(gettext libiconv)
 endif()
-- 
cgit 


From 0007aa50bd3d54259bb4ae717c114f5524ec59fa Mon Sep 17 00:00:00 2001
From: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date: Sat, 4 Mar 2023 00:30:07 +0100
Subject: build: unset variables ending with "URL" if USE_EXISTING_SRC_DIR is
 ON

This will reduce required boilerplate, but more importantly it will
automatically unset variables ending on URL. This will help people
needing to avoid to unset the URL variable each time a new dependency is
added.

It is possible that this may remove a non-download variable ending on
"URL" in the future, however, the risk of this is likely much lower than
the risk of someone forgetting to unset the variable.
---
 cmake.deps/cmake/BuildGettext.cmake | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'cmake.deps/cmake/BuildGettext.cmake')

diff --git a/cmake.deps/cmake/BuildGettext.cmake b/cmake.deps/cmake/BuildGettext.cmake
index 7db7d5e4fe..b6411a2617 100644
--- a/cmake.deps/cmake/BuildGettext.cmake
+++ b/cmake.deps/cmake/BuildGettext.cmake
@@ -1,7 +1,4 @@
 if(MSVC)
-  if(USE_EXISTING_SRC_DIR)
-    unset(GETTEXT_URL)
-  endif()
   ExternalProject_Add(gettext
     URL ${GETTEXT_URL}
     URL_HASH SHA256=${GETTEXT_SHA256}
-- 
cgit 


From 99b8a343e197cdec53f752e1cce01ae25eb45c12 Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Mon, 20 Nov 2023 12:42:54 +0100
Subject: fixup: quick update, squash later

---
 cmake.deps/cmake/BuildGettext.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cmake.deps/cmake/BuildGettext.cmake')

diff --git a/cmake.deps/cmake/BuildGettext.cmake b/cmake.deps/cmake/BuildGettext.cmake
index b6411a2617..33cfbe1a22 100644
--- a/cmake.deps/cmake/BuildGettext.cmake
+++ b/cmake.deps/cmake/BuildGettext.cmake
@@ -2,7 +2,6 @@ if(MSVC)
   ExternalProject_Add(gettext
     URL ${GETTEXT_URL}
     URL_HASH SHA256=${GETTEXT_SHA256}
-    DOWNLOAD_NO_PROGRESS TRUE
     DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/gettext
     PATCH_COMMAND ${CMAKE_COMMAND} -E copy
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/GettextCMakeLists.txt
@@ -10,7 +9,8 @@ if(MSVC)
     CMAKE_ARGS ${DEPS_CMAKE_ARGS}
       -D LIBICONV_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
       -D LIBICONV_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libcharset${CMAKE_STATIC_LIBRARY_SUFFIX}$<SEMICOLON>${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libiconv${CMAKE_STATIC_LIBRARY_SUFFIX}
-    CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
+    CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS}
+    ${EXTERNALPROJECT_OPTIONS})
 else()
   message(FATAL_ERROR "Trying to build gettext in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
 endif()
-- 
cgit