Author: rinrab
Date: Tue Jul 9 14:11:06 2024
New Revision: 1919063
URL: http://svn.apache.org/viewvc?rev=1919063&view=rev
Log:
On the 'cmake' branch: Configure SVN_BUILD_HOST and SVN_BUILD_TARGET
constants of the svn_private_config.h file by using CMake equivalents
of platform and system names.
* CMakeLists.txt
(): Setup SVN_BUILD_TARGET and SVN_BUILD_TARGET CMake varaibles to pass to
the configure_file() command and then to the svn_private_config.hc template.
* subversion/svn_private_config.hc
(): Remove previous check for platform and initialization of the
SVN_BUILD_HOST and SVN_BUILD_TARGET constants. Instead, configure them
by using CMake.
Modified:
subversion/branches/cmake/CMakeLists.txt
subversion/branches/cmake/subversion/svn_private_config.hc
Modified: subversion/branches/cmake/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/CMakeLists.txt?rev=1919063&r1=1919062&r2=1919063&view=diff
==============================================================================
--- subversion/branches/cmake/CMakeLists.txt (original)
+++ subversion/branches/cmake/CMakeLists.txt Tue Jul 9 14:11:06 2024
@@ -50,6 +50,9 @@ project("Subversion"
VERSION "${SVN_VERSION}"
)
+string(TOLOWER "${CMAKE_HOST_SYSTEM_PROCESSOR}-${CMAKE_HOST_SYSTEM_NAME}"
SVN_BUILD_HOST)
+string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}"
SVN_BUILD_TARGET)
+
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/subversion/svn_private_config.hc"
"${CMAKE_CURRENT_BINARY_DIR}/svn_private_config.h"
Modified: subversion/branches/cmake/subversion/svn_private_config.hc
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/subversion/svn_private_config.hc?rev=1919063&r1=1919062&r2=1919063&view=diff
==============================================================================
--- subversion/branches/cmake/subversion/svn_private_config.hc (original)
+++ subversion/branches/cmake/subversion/svn_private_config.hc Tue Jul 9
14:11:06 2024
@@ -30,22 +30,8 @@
#define SVN_PRIVATE_CONFIG_HW
-/* Define to a Windows-specific equivalent of config.guess output */
-#define SVN_BUILD_HOST "x86-microsoft-windows"
-
-#if defined(_M_X64)
-#define SVN_BUILD_TARGET "x64-microsoft-windows"
-#elif defined(_M_IA64)
-#define SVN_BUILD_TARGET "ia64-microsoft-windows"
-#elif defined( _M_IX86)
-#define SVN_BUILD_TARGET "x86-microsoft-windows"
-#elif defined(_M_ARM64)
-#define SVN_BUILD_TARGET "arm64-microsoft-windows"
-#elif defined(_M_ARM)
-#define SVN_BUILD_TARGET "arm-microsoft-windows"
-#else
-#error Unsupported build target.
-#endif
+#define SVN_BUILD_HOST "@SVN_BUILD_HOST@"
+#define SVN_BUILD_TARGET "@SVN_BUILD_TARGET@"
/* The minimal version of Berkeley DB we want */
#define SVN_FS_WANT_DB_MAJOR 4
