Author: rinrab
Date: Tue Jul 2 22:08:19 2024
New Revision: 1918861
URL: http://svn.apache.org/viewvc?rev=1918861&view=rev
Log:
On the 'cmake' branch: Disable target if msvc_force_static is true and
building shared libraries.
This fixes TODO from r1918860 [1] and now it is possible to build shared
libraries
and tests at the same time, but these tests would not be built.
[1]: [[[
Little regression: when using shared libraries and compiling test-suite,
some tests would not build, because they requires static libraries. The check
on it would be added later.
]]]
* build/generator/gen_cmake.py
(Generator.write): Add `NOT BUILD_SHARED_LIBS` string to the enable_condition
if msvc_force_static.
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=1918861&r1=1918860&r2=1918861&view=diff
==============================================================================
--- subversion/branches/cmake/build/generator/gen_cmake.py (original)
+++ subversion/branches/cmake/build/generator/gen_cmake.py Tue Jul 2 22:08:19
2024
@@ -113,6 +113,10 @@ class Generator(gen_base.GeneratorBase):
enable_condition = "SVN_BUILD_TOOLS";
else:
enable_condition = "SVN_BUILD_PROGRAMS";
+
+ if target.msvc_force_static:
+ # TODO: write warning
+ enable_condition += " AND NOT BUILD_SHARED_LIBS"
elif isinstance(target, gen_base.TargetRaModule):
enable_condition = "SVN_BUILD_" + get_module_name(target.name);
group = "SVN_RA_MODULES"
