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

Author: rinrab
Date: Thu Jul 18 14:23:42 2024
New Revision: 1919348

URL: http://svn.apache.org/viewvc?rev=1919348&view=rev
Log:
On the 'cmake' branch: Remove fs-base from ignore list to generate it, but
disable it.

The targets for fs-base and its tests are now generated to the targets.cmake
file, but are always disabled.

* build/generator/gen_cmake.py
  (check_ignore_target): Remove libsvn_fs_base from ignore_names and don't
   filter bdb-test.

* CMakeLists.txt
  (options): Add SVN_ENABLE_FS_BASE option and write error if it is true.

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=1919348&r1=1919347&r2=1919348&view=diff
==============================================================================
--- subversion/branches/cmake/CMakeLists.txt (original)
+++ subversion/branches/cmake/CMakeLists.txt Thu Jul 18 14:23:42 2024
@@ -67,6 +67,7 @@ option(SVN_ENABLE_RA_SERF "Enable Subver
 option(SVN_ENABLE_RA_SVN "Enable Subversion SVN Protocol Repository Access Library" ON)
 option(SVN_ENABLE_FS_FS "Enable Subversion FSFS Repository Filesystem Library" ON)
 option(SVN_ENABLE_FS_X "Enable Subversion FSX Repository Filesystem Library" ON)
+option(SVN_ENABLE_FS_BASE "Enable Subversion Filesystem Base Library (NOT IMPLEMENTED and DEPRECATED)" OFF)
 option(SVN_ENABLE_NLS "Enable gettext functionality" OFF)
 
 # Configuration
@@ -141,6 +142,10 @@ if(SVN_BUILD_SHARED_RA)
   message(FATAL_ERROR "SVN_BUILD_SHARED_RA not yet supported")
 endif()
 
+if(SVN_ENABLE_FS_BASE)
+  message(FATAL_ERROR "SVN_ENABLE_FS_BASE is NOT implemented and deprecated.")
+endif()
+
 if(BUILD_SHARED_LIBS OR SVN_BUILD_SHARED_FS OR SVN_BUILD_SHARED_RA)
   set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()

Modified: subversion/branches/cmake/build/generator/gen_cmake.py
URL: http://svn.apache.org/viewvc/subversion/branches/cmake/build/generator/gen_cmake.py?rev=1919348&r1=1919347&r2=1919348&view=diff
==============================================================================
--- subversion/branches/cmake/build/generator/gen_cmake.py (original)
+++ subversion/branches/cmake/build/generator/gen_cmake.py Thu Jul 18 14:23:42 2024
@@ -238,8 +238,6 @@ class Generator(gen_base.GeneratorBase):
 
       "svnxx-tests",
 
-      "libsvn_fs_base",
-
       "mod_authz_svn",
       "mod_dav_svn",
       "mod_dontdothat",
@@ -253,10 +251,6 @@ class Generator(gen_base.GeneratorBase):
       if target.name == name:
         return True
 
-      if isinstance(target, gen_base.TargetExe):
-        if target.install == "bdb-test":
-          return True
-
   if sys.platform == 'win32':
     def errno_filter(self, codes):
       """From errno_filter() in gen_win.py"""