Skip to content

Commit e243d4c

Browse files
committed
Handle modern CMake with vendored picotls
1 parent f7d3ee5 commit e243d4c

3 files changed

Lines changed: 5 additions & 0 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
- name: Configure
4646
run: >
4747
cmake -S . -B build
48+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
4849
-DOPENMOQ_PICOQUIC_SOURCE_DIR="${{ github.workspace }}/third_party/picoquic"
4950
-DOPENMOQ_PICOTLS_SOURCE_DIR="${{ github.workspace }}/third_party/picotls"
5051

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ jobs:
4949
run: >
5050
cmake -S . -B build
5151
-DCMAKE_BUILD_TYPE=Release
52+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
5253
-DOPENMOQ_PICOQUIC_SOURCE_DIR="${{ github.workspace }}/third_party/picoquic"
5354
-DOPENMOQ_PICOTLS_SOURCE_DIR="${{ github.workspace }}/third_party/picotls"
5455
-DOPENMOQ_RUN_PICOQUIC_SMOKE_TESTS=OFF

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ if(OPENMOQ_ENABLE_PICOQUIC AND EXISTS "${OPENMOQ_PICOQUIC_SOURCE_DIR}/CMakeLists
2323
"Path to a picotls source checkout")
2424

2525
if(EXISTS "${OPENMOQ_PICOTLS_SOURCE_DIR}/CMakeLists.txt")
26+
# picotls still declares CMake 2.8 compatibility; newer CMake releases
27+
# require an explicit policy floor when configuring that subproject.
28+
set(CMAKE_POLICY_VERSION_MINIMUM "3.5" CACHE STRING "" FORCE)
2629
set(PICOQUIC_FETCH_PTLS ON CACHE BOOL "" FORCE)
2730
set(FETCHCONTENT_SOURCE_DIR_PICOTLS "${OPENMOQ_PICOTLS_SOURCE_DIR}" CACHE PATH "" FORCE)
2831
set(picoquic_BUILD_TESTS OFF CACHE BOOL "" FORCE)

0 commit comments

Comments
 (0)