Skip to content

Commit ea7a074

Browse files
authored
Merge pull request #2311 from mazunki/bump-cmake-3.31
Update deprecated cmake version
2 parents 937df39 + 7097eda commit ea7a074

File tree

79 files changed

+79
-81
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+79
-81
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.6)
1+
cmake_minimum_required(VERSION 3.31.6)
22

33
#we are only creating libraries for ELF
44
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)

deps/libfdt/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.31.6)
22

33
project(libfdt)
44

example/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.6)
1+
cmake_minimum_required(VERSION 3.31.6)
22
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
33

44
project(hello_includeos)

lib/LiveUpdate/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.6.0)
1+
cmake_minimum_required(VERSION 3.31.6)
22

33
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
44

@@ -29,7 +29,6 @@ set(CMAKE_CXX_COMPILER_TARGET ${TRIPLE})
2929
set(CMAKE_C_COMPILER_TARGET ${TRIPLE})
3030

3131
add_custom_command(
32-
PRE_BUILD
3332
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/hotswap64.bin
3433
COMMAND ${CMAKE_ASM_NASM_COMPILER} -f bin -o ${CMAKE_CURRENT_BINARY_DIR}/hotswap64.bin ${CMAKE_CURRENT_SOURCE_DIR}/src/hotswap64.asm
3534
COMMENT "Building hotswap binary"

src/chainload/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.6)
1+
cmake_minimum_required(VERSION 3.31.6)
22
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
33
# IncludeOS install location
44
project(chainloader C CXX)

test/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.6.0)
1+
cmake_minimum_required(VERSION 3.31.6)
22

33
project(unittests C CXX)
44
set(CMAKE_CXX_STANDARD 20)
@@ -250,7 +250,6 @@ add_custom_command(TARGET clangtidy
250250

251251
if (GENERATE_SUPPORT_FILES)
252252
add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/test-tar-gz-inside.tar
253-
PRE_BUILD
254253
COMMAND ${CMAKE_COMMAND} -E tar cf ${CMAKE_CURRENT_BINARY_DIR}/test-single.tar ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
255254
COMMAND ${CMAKE_COMMAND} -E tar cf ${CMAKE_CURRENT_BINARY_DIR}/test-multiple.tar ${CMAKE_CURRENT_SOURCE_DIR}/*.py
256255
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_BINARY_DIR}/test-invalid.tar

test/fs/integration/fat16/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.31.6)
22
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
33

44
project(service)

test/fs/integration/ide/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.31.6)
22
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
33

44
project(service)

test/fs/integration/ide_write/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.31.6)
22
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
33

44
project(service)

test/fs/integration/memdisk/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.5)
1+
cmake_minimum_required(VERSION 3.31.6)
22
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
33

44
project(memdisk)

0 commit comments

Comments
 (0)