Skip to content

Commit 93fab3b

Browse files
authored
Merge pull request #59 from SereneRuby12/fix-build
fix build with cmake 4.0
2 parents 4d69e4f + ae4a8c2 commit 93fab3b

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
run: |
4141
mkdir build
4242
cd build
43-
cmake .. -A x64 -T v143 -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CONFIGURATION_TYPES=${{matrix.build_type}} -DPLAYLUNKY_CONAN_VERBOSE=ON
43+
cmake .. -A x64 -T v143 -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CONFIGURATION_TYPES=${{matrix.build_type}} -DPLAYLUNKY_CONAN_VERBOSE=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
4444
4545
- name: Build
4646
run: |

.github/workflows/Nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
run: |
5151
mkdir build
5252
cd build
53-
cmake .. -A x64 -T v143 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DPLAYLUNKY_CONAN_VERBOSE=ON
53+
cmake .. -A x64 -T v143 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES=Release -DPLAYLUNKY_CONAN_VERBOSE=ON -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
5454
5555
- name: Build
5656
run: |

.github/workflows/Publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: |
4242
mkdir build
4343
cd build
44-
cmake .. -A x64 -T v143
44+
cmake .. -A x64 -T v143 -DCMAKE_POLICY_VERSION_MINIMUM="3.5"
4545
4646
- name: Build
4747
run: |

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
cmake_minimum_required(VERSION 3.24)
22

3+
# Used to fix building errors with conan libraries that haven't updated
4+
if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.0")
5+
set(ENV{CMAKE_POLICY_VERSION_MINIMUM} 3.5)
6+
endif()
7+
38
# --------------------------------------------------
49
# Run conan
510
include(cmake/conan.cmake)

0 commit comments

Comments
 (0)