Author: rinrab
Date: Wed Jul 10 21:39:50 2024
New Revision: 1919107
URL: http://svn.apache.org/viewvc?rev=1919107&view=rev
Log:
On the 'cmake' branch: Remove sorting of the targets by type; it is no longer
required, because FS and RA modules are linked by using interface targets,
which can be declared in any order.
* build/generator/gen_cmake.py
(Generator.write): Remove and don't initialize '*_targets' variables, but
add 'targets' variable and append the targets into it.
Modified:
subversion/branches/cmake/build/generator/gen_cmake.py
Modified: subversion/branches/cmake/build/generator/gen_cmake.py
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/build/generator/gen_cmake.py?rev=1919107&r1=1919106&r2=1919107&view=diff
==============================================================================
--- subversion/branches/cmake/build/generator/gen_cmake.py (original)
+++ subversion/branches/cmake/build/generator/gen_cmake.py Wed Jul 10 21:39:50
2024
@@ -96,14 +96,7 @@ class Generator(gen_base.GeneratorBase):
gen_base.GeneratorBase.__init__(self, fname, verfname, options)
def write(self):
- # FS and RA modules. They have to be declared before other libraries
- mod_targets = []
- # libsvn_* targets
- lib_targets = []
- # Program targets
- exe_targets = []
- # The test suite
- test_targets = []
+ targets = []
for target in self.get_install_sources():
target: gen_base.Target
@@ -208,19 +201,7 @@ class Generator(gen_base.GeneratorBase):
srcdir = target.path,
)
- if isinstance(target, gen_base.TargetExe):
- if target_type == "test":
- test_targets.append(new_target)
- else:
- exe_targets.append(new_target)
- elif isinstance(target, gen_base.TargetRaModule) or \
- isinstance(target, gen_base.TargetFsModule):
- mod_targets.append(new_target)
- elif isinstance(target, gen_base.TargetLib):
- lib_targets.append(new_target)
-
- # Sort targets for better readability
- targets = mod_targets + lib_targets + exe_targets + test_targets
+ targets.append(new_target)
data = _eztdata(
targets = targets,
