svn commit: r1919222 - in /subversion/branches/cmake: CMakeLists.txt build/generator/gen_cmake.py

Author: rinrab
Date: Sun Jul 14 16:24:18 2024
New Revision: 1919222

URL: http://svn.apache.org/viewvc?rev=1919222&view=rev
Log:
On the 'cmake' branch: Rename SVN_BUILD_FS_* and SVN_BUILD_RA_* options to
SVN_ENABLE_**_**.

This naming style is more common for CMake and used by some projects.

* build/generator/gen_cmake.py,
  CMakeLists.txt: Rename the options and adjust their descriptions.

Modified:
    subversion/branches/cmake/CMakeLists.txt
    subversion/branches/cmake/build/generator/gen_cmake.py

Modified: subversion/branches/cmake/CMakeLists.txt
URL: http://svn.apache.org/viewvc/subversion/branches/cmake/CMakeLists.txt?rev=1919222&r1=1919221&r2=1919222&view=diff
==============================================================================
--- subversion/branches/cmake/CMakeLists.txt (original)
+++ subversion/branches/cmake/CMakeLists.txt Sun Jul 14 16:24:18 2024
@@ -71,28 +71,28 @@ configure_file(
   "${CMAKE_CURRENT_BINARY_DIR}/svn_private_config.h"
 )
 
-option(SVN_BUILD_RA_LOCAL "Build Subversion Local Repository Access Library" ON)
-if (SVN_BUILD_RA_LOCAL)
+option(SVN_ENABLE_RA_LOCAL "Enable Subversion Local Repository Access Library" ON)
+if (SVN_ENABLE_RA_LOCAL)
   add_compile_definitions("SVN_LIBSVN_RA_LINKS_RA_LOCAL")
 endif()
 
-option(SVN_BUILD_RA_SERF "Build Subversion HTTP/WebDAV Protocol Repository Access Library" OFF)
-if (SVN_BUILD_RA_SERF)
+option(SVN_ENABLE_RA_SERF "Enable Subversion HTTP/WebDAV Protocol Repository Access Library" OFF)
+if (SVN_ENABLE_RA_SERF)
   add_compile_definitions("SVN_LIBSVN_RA_LINKS_RA_SERF")
 endif()
 
-option(SVN_BUILD_RA_SVN "Build Subversion SVN Protocol Repository Access Library" ON)
-if (SVN_BUILD_RA_SVN)
+option(SVN_ENABLE_RA_SVN "Enable Subversion SVN Protocol Repository Access Library" ON)
+if (SVN_ENABLE_RA_SVN)
   add_compile_definitions("SVN_LIBSVN_RA_LINKS_RA_SVN")
 endif()
 
-option(SVN_BUILD_FS_FS "Build Subversion FSFS Repository Filesystem Library" ON)
-if (SVN_BUILD_FS_FS)
+option(SVN_ENABLE_FS_FS "Enable Subversion FSFS Repository Filesystem Library" ON)
+if (SVN_ENABLE_FS_FS)
   add_compile_definitions("SVN_LIBSVN_FS_LINKS_FS_FS")
 endif()
 
-option(SVN_BUILD_FS_X "Build Subversion FSX Repository Filesystem Library" ON)
-if (SVN_BUILD_FS_X)
+option(SVN_ENABLE_FS_X "Enable Subversion FSX Repository Filesystem Library" ON)
+if (SVN_ENABLE_FS_X)
   add_compile_definitions("SVN_LIBSVN_FS_LINKS_FS_X")
 endif()
 
@@ -206,7 +206,7 @@ else()
 endif()
 
 ### Serf
-if (SVN_BUILD_RA_SERF)
+if (SVN_ENABLE_RA_SERF)
   find_package(Serf REQUIRED)
   add_library(external-serf ALIAS Serf::Serf)
 endif()
@@ -379,11 +379,11 @@ message(STATUS "    Build shared librari
 message(STATUS "    Build shared FS Modues ........ : ${SVN_BUILD_SHARED_FS}")
 message(STATUS "    Build shared RA Modues ........ : ${SVN_BUILD_SHARED_RA}")
 message(STATUS "  Optional modules and targets:")
-message(STATUS "    Build FS FS ................... : ${SVN_BUILD_FS_FS}")
-message(STATUS "    Build FS X .................... : ${SVN_BUILD_FS_X}")
-message(STATUS "    Build RA LOCAL ................ : ${SVN_BUILD_RA_LOCAL}")
-message(STATUS "    Build RA SVN .................. : ${SVN_BUILD_RA_SVN}")
-message(STATUS "    Build RA SERF ................. : ${SVN_BUILD_RA_SERF}")
+message(STATUS "    Enable FS FS .................. : ${SVN_ENABLE_FS_FS}")
+message(STATUS "    Enable FS X ................... : ${SVN_ENABLE_FS_X}")
+message(STATUS "    Enable RA LOCAL ............... : ${SVN_ENABLE_RA_LOCAL}")
+message(STATUS "    Enable RA SVN ................. : ${SVN_ENABLE_RA_SVN}")
+message(STATUS "    Enable RA SERF ................ : ${SVN_ENABLE_RA_SERF}")
 message(STATUS "    Build Apache Modules .......... : NOT IMPLEMENTED, HTTPD v2.4.68 (TODO:)")
 message(STATUS "    Build programs ................ : ${SVN_BUILD_PROGRAMS}")
 message(STATUS "    Build tools ................... : ${SVN_BUILD_TOOLS}")

Modified: subversion/branches/cmake/build/generator/gen_cmake.py
URL: http://svn.apache.org/viewvc/subversion/branches/cmake/build/generator/gen_cmake.py?rev=1919222&r1=1919221&r2=1919222&view=diff
==============================================================================
--- subversion/branches/cmake/build/generator/gen_cmake.py (original)
+++ subversion/branches/cmake/build/generator/gen_cmake.py Sun Jul 14 16:24:18 2024
@@ -93,11 +93,11 @@ class Generator(gen_base.GeneratorBase):
           # TODO: write warning
           enable_condition.append("NOT BUILD_SHARED_LIBS")
       elif isinstance(target, gen_base.TargetRaModule):
-        enable_condition.append("SVN_BUILD_" + get_module_name(target.name))
+        enable_condition.append("SVN_ENABLE_" + get_module_name(target.name))
         group = "ra-libs"
         build_type = "${SVN_RA_BUILD_TYPE}"
       elif isinstance(target, gen_base.TargetFsModule):
-        enable_condition.append("SVN_BUILD_" + get_module_name(target.name))
+        enable_condition.append("SVN_ENABLE_" + get_module_name(target.name))
         group = "fs-libs"
         build_type = "${SVN_FS_BUILD_TYPE}"
       elif isinstance(target, gen_base.TargetApacheMod):