diff options
| author | Brad King <brad.king@kitware.com> | 2022-12-05 17:58:48 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-12-05 17:58:57 (GMT) |
| commit | e0a35098bb2874ac7d6bca5b1a989c293ad18922 (patch) | |
| tree | 05c492925fd20b048454967e7e69f0b29028868f | |
| parent | 7006ca919067c6baa831b21026cb37ab8f2e9732 (diff) | |
| parent | 466f9b886da1826243e222e946a48ba1428acf63 (diff) | |
| download | CMake-e0a35098bb2874ac7d6bca5b1a989c293ad18922.zip CMake-e0a35098bb2874ac7d6bca5b1a989c293ad18922.tar.gz CMake-e0a35098bb2874ac7d6bca5b1a989c293ad18922.tar.bz2 | |
Merge topic 'ArgumentFlags-function-args'
466f9b886d cmTargetPropCommandBase::HandleArguments: flags must be OR'able
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7983
| -rw-r--r-- | Source/cmTargetIncludeDirectoriesCommand.cxx | 5 | ||||
| -rw-r--r-- | Source/cmTargetPropCommandBase.cxx | 2 | ||||
| -rw-r--r-- | Source/cmTargetPropCommandBase.h | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/Source/cmTargetIncludeDirectoriesCommand.cxx b/Source/cmTargetIncludeDirectoriesCommand.cxx index cb83873..7a2dd09 100644 --- a/Source/cmTargetIncludeDirectoriesCommand.cxx +++ b/Source/cmTargetIncludeDirectoriesCommand.cxx @@ -100,8 +100,7 @@ bool cmTargetIncludeDirectoriesCommand(std::vector<std::string> const& args, { return TargetIncludeDirectoriesImpl(status).HandleArguments( args, "INCLUDE_DIRECTORIES", - static_cast<TargetIncludeDirectoriesImpl::ArgumentFlags>( - TargetIncludeDirectoriesImpl::PROCESS_BEFORE | + TargetIncludeDirectoriesImpl::PROCESS_BEFORE | TargetIncludeDirectoriesImpl::PROCESS_AFTER | - TargetIncludeDirectoriesImpl::PROCESS_SYSTEM)); + TargetIncludeDirectoriesImpl::PROCESS_SYSTEM); } diff --git a/Source/cmTargetPropCommandBase.cxx b/Source/cmTargetPropCommandBase.cxx index 391b954..8d2ff71 100644 --- a/Source/cmTargetPropCommandBase.cxx +++ b/Source/cmTargetPropCommandBase.cxx @@ -23,7 +23,7 @@ void cmTargetPropCommandBase::SetError(std::string const& e) bool cmTargetPropCommandBase::HandleArguments( std::vector<std::string> const& args, const std::string& prop, - ArgumentFlags flags) + unsigned int flags) { if (args.size() < 2) { this->SetError("called with incorrect number of arguments"); diff --git a/Source/cmTargetPropCommandBase.h b/Source/cmTargetPropCommandBase.h index 487beb4..ac50b4d 100644 --- a/Source/cmTargetPropCommandBase.h +++ b/Source/cmTargetPropCommandBase.h @@ -29,8 +29,7 @@ public: }; bool HandleArguments(std::vector<std::string> const& args, - const std::string& prop, - ArgumentFlags flags = NO_FLAGS); + const std::string& prop, unsigned int flags = NO_FLAGS); protected: std::string Property; |