Skip to content

Commit

Permalink
Merge pull request bareos#2169
Browse files Browse the repository at this point in the history
cmake: add cmake_parse_arguments policy CMP0174
  • Loading branch information
BareosBot authored Feb 14, 2025
2 parents 302907f + 037e427 commit 7bf9efe
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- bconsole: enable app icon on windows [PR #2105]
- windows: fix readlink buffer size issue [PR #2153]
- Fix btape fill-test problem [PR #2018]
- cmake: add cmake_parse_arguments policy CMP0174 [PR #2169]

### Documentation
- docs: fix grpc-fd plugin call [PR #2068]
Expand Down Expand Up @@ -66,4 +67,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[PR #2144]: https://github.com/bareos/bareos/pull/2144
[PR #2147]: https://github.com/bareos/bareos/pull/2147
[PR #2153]: https://github.com/bareos/bareos/pull/2153
[PR #2169]: https://github.com/bareos/bareos/pull/2169
[unreleased]: https://github.com/bareos/bareos/tree/master
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
# on MSVC
else()
cmake_minimum_required(VERSION 3.17)
cmake_policy(VERSION 3.17...3.19)
cmake_policy(VERSION 3.17...3.31)
endif()

project(bareos NONE)
Expand Down
4 changes: 2 additions & 2 deletions core/cmake/BareosCopyDllsToBinDir.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# BAREOS® - Backup Archiving REcovery Open Sourced
#
# Copyright (C) 2024-2024 Bareos GmbH & Co. KG
# Copyright (C) 2024-2025 Bareos GmbH & Co. KG
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of version three of the GNU Affero General Public
Expand Down Expand Up @@ -44,7 +44,7 @@ macro(BareosCopyDllsToBinDir)
)
add_custom_command(
TARGET ${TGT}
POST_BUILD JOB_POOL copy
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy -t $<TARGET_FILE_DIR:${TGT}>
$<TARGET_RUNTIME_DLLS:${TGT}>;${DLLS_TO_COPY_MANUALLY}
COMMAND_EXPAND_LISTS
Expand Down

0 comments on commit 7bf9efe

Please sign in to comment.