Skip to content

Commit

Permalink
remove cmake deprecation warning by requiring version > 3.10; set VCP…
Browse files Browse the repository at this point in the history
…KG_VERSION as edge in manifest mode install; require C++ 17 std
  • Loading branch information
bitmeal committed Dec 10, 2024
1 parent 8d2c91c commit d1d1e5c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions test/manifest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
#
# Copyright (C) 2022, Arne Wendt
#
cmake_minimum_required(VERSION 3.0.0)
set(CMAKE_CXX_STANDARD 11)
cmake_minimum_required(VERSION 3.19.0)
set(CMAKE_CXX_STANDARD 17)

# init VCPKG [before call to project()]
set(VCPKG_VERSION)
set(VCPKG_VERSION edge)
include(../../vcpkg.cmake)

project(vcpkg-cmake-test-manifest VERSION 0.1.0)


# configure build and tests
enable_testing()
add_subdirectory("../" "${CMAKE_CURRENT_BINARY_DIR}/test")
add_subdirectory("../" "${CMAKE_CURRENT_BINARY_DIR}/test")
6 changes: 3 additions & 3 deletions test/manifest_packages_autogen/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
# Copyright (C) 2022, Arne Wendt
#
cmake_minimum_required(VERSION 3.0.0)
set(CMAKE_CXX_STANDARD 11)
cmake_minimum_required(VERSION 3.19.0)
set(CMAKE_CXX_STANDARD 17)

# init VCPKG [before call to project()]
set(VCPKG_VERSION edge)
Expand All @@ -23,4 +23,4 @@ endif()

# configure build and tests
enable_testing()
add_subdirectory("../" "${CMAKE_CURRENT_BINARY_DIR}/test")
add_subdirectory("../" "${CMAKE_CURRENT_BINARY_DIR}/test")
6 changes: 3 additions & 3 deletions test/packages/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#
# Copyright (C) 2022, Arne Wendt
#
cmake_minimum_required(VERSION 3.0.0)
set(CMAKE_CXX_STANDARD 11)
cmake_minimum_required(VERSION 3.19.0)
set(CMAKE_CXX_STANDARD 17)

# init VCPKG [before call to project()]
set(VCPKG_VERSION latest)
Expand All @@ -21,4 +21,4 @@ vcpkg_add_package(plog)

# configure build and tests
enable_testing()
add_subdirectory("../" "${CMAKE_CURRENT_BINARY_DIR}/test")
add_subdirectory("../" "${CMAKE_CURRENT_BINARY_DIR}/test")

0 comments on commit d1d1e5c

Please sign in to comment.