Author: rinrab
Date: Sat Jun 29 15:53:19 2024
New Revision: 1918748
URL: http://svn.apache.org/viewvc?rev=1918748&view=rev
Log:
On the 'cmake' branch: Little refactoring, to remove has_* fields from
cmake_target class; before it was not working with no reason :-)
* build/generator/gen_cmake.py
(cmake_target): Remove has_msvc_libs and has_msvc_objects fields from
the class
* build/generator/templates/CMakeLists.txt.ezt
(targets loop): Check just for msvc_libs and msvc_objects by [if-any]
command instead of has_msvc_libs and has_msvc_objects.
Modified:
subversion/branches/cmake/build/generator/gen_cmake.py
subversion/branches/cmake/build/generator/templates/CMakeLists.txt.ezt
Modified: subversion/branches/cmake/build/generator/gen_cmake.py
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/build/generator/gen_cmake.py?rev=1918748&r1=1918747&r2=1918748&view=diff
==============================================================================
--- subversion/branches/cmake/build/generator/gen_cmake.py (original)
+++ subversion/branches/cmake/build/generator/gen_cmake.py Sat Jun 29 15:53:19
2024
@@ -42,9 +42,6 @@ class cmake_target():
self.group = group
- self.has_msvc_libs = ezt.boolean(len(msvc_libs) > 0)
- self.has_msvc_objects = ezt.boolean(len(msvc_objects) > 0)
-
def get_target_type(target: gen_base.Target):
if isinstance(target, gen_base.TargetExe):
if target.install == "test" and target.testing != "skip":
Modified: subversion/branches/cmake/build/generator/templates/CMakeLists.txt.ezt
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/build/generator/templates/CMakeLists.txt.ezt?rev=1918748&r1=1918747&r2=1918748&view=diff
==============================================================================
--- subversion/branches/cmake/build/generator/templates/CMakeLists.txt.ezt
(original)
+++ subversion/branches/cmake/build/generator/templates/CMakeLists.txt.ezt Sat
Jun 29 15:53:19 2024
@@ -51,10 +51,10 @@ add_executable([targets.name][for target
)
[end]target_link_libraries([targets.name] PRIVATE[for targets.libs]
[targets.libs][end]
-)[if-any targets.has_msvc_libs]
+)[if-any targets.msvc_libs]
if (WIN32)
target_link_libraries([targets.name] PRIVATE[for targets.msvc_libs]
[targets.msvc_libs][end])
-endif()[end][if-any targets.has_msvc_objects]
+endif()[end][if-any targets.msvc_objects]
if (MSVC)
set_target_properties([targets.name] PROPERTIES LINK_FLAGS[for
targets.msvc_objects] [targets.msvc_objects][end])
endif()[end]
