svn commit: r1920470 - /subversion/branches/cmake/build/generator/gen_cmake.py

Author: rinrab
Date: Wed Sep  4 15:43:49 2024
New Revision: 1920470

URL: http://svn.apache.org/viewvc?rev=1920470&view=rev
Log:
On the 'cmake' branch: Disable targets, that have msvc_force_static only on
Windows platforms, because Linux doesn't have any limitations with them.

* build/generator/gen_cmake.py
  (get_target_conditions): Generate `NOT (BUILD_SHARED_LIBS AND WIN32)`
   condition instead of `NOT BUILD_SHARED_LIBS` for the force-static
   targets.

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=1920470&r1=1920469&r2=1920470&view=diff
==============================================================================
--- subversion/branches/cmake/build/generator/gen_cmake.py (original)
+++ subversion/branches/cmake/build/generator/gen_cmake.py Wed Sep  4 15:43:49 2024
@@ -84,7 +84,7 @@ def get_target_conditions(target):
       enable_condition.append("SVN_ENABLE_PROGRAMS")
 
     if target.msvc_force_static:
-      enable_condition.append("NOT BUILD_SHARED_LIBS")
+      enable_condition.append("NOT (BUILD_SHARED_LIBS AND WIN32)")
 
   if isinstance(target, gen_base.TargetSWIG) or \
      isinstance(target, gen_base.TargetSWIGLib):