Browse Source

cmTargetPropCommandBase: Restore ArgumentFlags enum value bool logic

The values of the cmTargetPropCommandBase::ArgumentFlags enum
are combined in boolean OR and AND operations in various places.
That used to be valid, but some values were added over time which did
not preserve support for such boolean logic. Update the enum values
such that they are increasing powers of 2 to restore that capability.

Fixes: #24199
Craig Scott 3 years ago
parent
commit
dd3482f675

+ 2 - 2
Source/cmTargetPropCommandBase.h

@@ -24,8 +24,8 @@ public:
     NO_FLAGS = 0x0,
     PROCESS_BEFORE = 0x1,
     PROCESS_AFTER = 0x2,
-    PROCESS_SYSTEM = 0x3,
-    PROCESS_REUSE_FROM = 0x4
+    PROCESS_SYSTEM = 0x4,
+    PROCESS_REUSE_FROM = 0x8
   };
 
   bool HandleArguments(std::vector<std::string> const& args,

+ 1 - 0
Tests/RunCMake/target_compile_options/RunCMakeTest.cmake

@@ -1,6 +1,7 @@
 include(RunCMake)
 
 run_cmake(empty_keyword_args)
+run_cmake(bad_keyword)
 
 if (CMAKE_C_COMPILER_ID MATCHES "GNU|LCC|Clang")
   macro(run_cmake_target test subtest target)

+ 1 - 0
Tests/RunCMake/target_compile_options/bad_keyword-result.txt

@@ -0,0 +1 @@
+1

+ 2 - 0
Tests/RunCMake/target_compile_options/bad_keyword-stderr.txt

@@ -0,0 +1,2 @@
+CMake Error at bad_keyword\.cmake:[0-9]+ \(target_compile_options\):
+  target_compile_options called with invalid arguments

+ 5 - 0
Tests/RunCMake/target_compile_options/bad_keyword.cmake

@@ -0,0 +1,5 @@
+add_library(iface INTERFACE)
+
+# SYSTEM is a recognized keyword for the base class used to implement the
+# command. Verify that we don't allow it.
+target_compile_options(iface SYSTEM PRIVATE)