Skip to content

Commit 99e74f5

Browse files
committed
Merge branch 'dev-0.8' into poc/webdav
2 parents a6ecd5b + a8cb20d commit 99e74f5

File tree

6 files changed

+199
-203
lines changed

6 files changed

+199
-203
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.17.0
1+
18.18.0

CMakeLists.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
project(rn-static-server C)
2-
cmake_minimum_required(VERSION 3.7.0 FATAL_ERROR)
2+
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
33

44
# This prevents CMake from complaining that INSTALL(..) directives in
55
# Lighttpd CMakeLists.txt miss BUNDLE DESTINATION.
@@ -69,12 +69,8 @@ execute_process(
6969
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/sysroot
7070
-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
7171
${EXTRA_BUILD_ARGS}
72-
73-
# TODO: This is a handy option, but requires CMake >= 3.15
74-
# COMMAND_ECHO STDOUT
75-
76-
# TODO: This is a useful argument, but requires CMake >= 3.19
77-
# COMMAND_ERROR_IS_FATAL ANY
72+
COMMAND_ECHO STDOUT
73+
COMMAND_ERROR_IS_FATAL ANY
7874
)
7975

8076
execute_process(

0 commit comments

Comments
 (0)