Author: rinrab
Date: Mon Jul  1 16:02:57 2024
New Revision: 1918788

URL: http://svn.apache.org/viewvc?rev=1918788&view=rev
Log:
On the 'cmake' branch: Add options for disabling any of programs, tools,
and tests.

These options are the following:
- SVN_BUILD_PROGRAMS for command-line tools (svn, svnadmin, and other).
- SVN_BUILD_TOOLS for tools, usually needed for developers
- SVN_BUILD_TEST builds Subversion test-suite

* build/cmake/options.cmake
  (): Adding the options, which are explained above.

* build/generator/gen_cmake.py
  (Generator.write): Set the enable_condition field for the targets that can
   be disabled by the options.

Modified:
    subversion/branches/cmake/build/cmake/options.cmake
    subversion/branches/cmake/build/generator/gen_cmake.py

Modified: subversion/branches/cmake/build/cmake/options.cmake
URL: 
http://svn.apache.org/viewvc/subversion/branches/cmake/build/cmake/options.cmake?rev=1918788&r1=1918787&r2=1918788&view=diff
==============================================================================
--- subversion/branches/cmake/build/cmake/options.cmake (original)
+++ subversion/branches/cmake/build/cmake/options.cmake Mon Jul  1 16:02:57 2024
@@ -49,3 +49,7 @@ option(SVN_BUILD_FS_X "Build Subversion
 if (SVN_BUILD_FS_X)
   add_compile_definitions("SVN_LIBSVN_FS_LINKS_FS_X")
 endif()
+
+option(SVN_BUILD_PROGRAMS "Build Subversion programs (such as svn.exe)" ON)
+option(SVN_BUILD_TOOLS "Build Subversion tools" OFF)
+option(SVN_BUILD_TEST "Build Subversion test-suite" OFF)

Modified: subversion/branches/cmake/build/generator/gen_cmake.py
URL: 
http://svn.apache.org/viewvc/subversion/branches/cmake/build/generator/gen_cmake.py?rev=1918788&r1=1918787&r2=1918788&view=diff
==============================================================================
--- subversion/branches/cmake/build/generator/gen_cmake.py (original)
+++ subversion/branches/cmake/build/generator/gen_cmake.py Mon Jul  1 16:02:57 
2024
@@ -105,11 +105,11 @@ class Generator(gen_base.GeneratorBase):
         continue
       elif isinstance(target, gen_base.TargetExe):
         if target.install == "test" or target.install == "sub-test":
-          pass
+          enable_condition = "SVN_BUILD_TEST";
         elif target.install == "tools":
-          pass
+          enable_condition = "SVN_BUILD_TOOLS";
         else:
-          pass
+          enable_condition = "SVN_BUILD_PROGRAMS";
       elif isinstance(target, gen_base.TargetRaModule):
         enable_condition = "SVN_BUILD_" + get_module_name(target.name);
         group = "SVN_RA_MODULES"


Reply via email to