Merge pull request #79 from luavela/imun/update-cmake

igelhaus · web-flow · commit 0f91ea524d8d · 2025-05-04T09:50:43.000+03:00
Bump CMake minimal version up to 3.5
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -2,8 +2,6 @@
 # Copyright (C) 2020-2025 LuaVela Authors. See Copyright Notice in COPYRIGHT
 # Copyright (C) 2015-2020 IPONWEB Ltd. See Copyright Notice in COPYRIGHT
 
-cmake_minimum_required (VERSION 3.3.2 FATAL_ERROR)
-
 include(ExternalProject)
 
 set(THIRD_PARTY_INCLUDE)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@
 # Copyright (C) 2015-2020 IPONWEB Ltd. See Copyright Notice in COPYRIGHT
 
 # --- Initial setup ------------------------------------------------------------
-cmake_minimum_required(VERSION 3.3.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5)
 project(UJIT C)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
@@ -60,10 +60,8 @@ set_property(CACHE UJIT_TEST_LIB_TYPE PROPERTY STRINGS ${UJIT_TEST_LIB_TYPE_VALU
 message(STATUS "UJIT_TEST_LIB_TYPE='${UJIT_TEST_LIB_TYPE}'")
 
 # Check that UJIT_TEST_LIB_TYPE value is correct
-# In CMake 3.5 we'll be able to use IN_LIST here
-list(FIND UJIT_TEST_LIB_TYPE_VALUES ${UJIT_TEST_LIB_TYPE} TEST_LIB_TYPE_INDEX)
-if(TEST_LIB_TYPE_INDEX EQUAL -1)
-  message(FATAL_ERROR "UJIT_TEST_LIB_TYPE must be \"static\" or \"shared\"")
+if(NOT UJIT_TEST_LIB_TYPE IN_LIST UJIT_TEST_LIB_TYPE_VALUES)
+  message(FATAL_ERROR "UJIT_TEST_LIB_TYPE must be one of the following: ${UJIT_TEST_LIB_TYPE_VALUES}.")
 endif()
 
 # Name of the CLI binary to be used in tests:
diff --git a/cmake/ClangTidy.cmake b/cmake/ClangTidy.cmake
@@ -23,7 +23,6 @@ function(add_clang_tidy_check TARGET_NAME)
   set(singleValues)
   set(multiValues FILES DEPENDENCIES)
 
-  include(CMakeParseArguments) # if we update to CMake >= 3.5, can remove this line
   cmake_parse_arguments(${prefix}
                         "${noValues}"
                         "${singleValues}"
diff --git a/cmake/MakeSourceList.cmake b/cmake/MakeSourceList.cmake
@@ -26,7 +26,6 @@ function(make_source_list list)
   set(singleValues)
   set(multiValues SOURCES)
 
-  include(CMakeParseArguments) # if we update to CMake >= 3.5, can remove this line
   cmake_parse_arguments(${prefix}
                         "${noValues}"
                         "${singleValues}"
diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
@@ -2,8 +2,6 @@
 # Copyright (C) 2020-2025 LuaVela Authors. See Copyright Notice in COPYRIGHT
 # Copyright (C) 2015-2020 IPONWEB Ltd. See Copyright Notice in COPYRIGHT
 
-cmake_minimum_required (VERSION 3.3.2 FATAL_ERROR)
-
 set(UJIT_MAN_PAGE ${CMAKE_CURRENT_SOURCE_DIR}/ujit.1)
 set(UJIT_COMPRESSED_MAN_PAGE ${CMAKE_CURRENT_BINARY_DIR}/ujit.1.gz)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -2,7 +2,6 @@
 # Copyright (C) 2020-2025 LuaVela Authors. See Copyright Notice in COPYRIGHT
 # Copyright (C) 2015-2020 IPONWEB Ltd. See Copyright Notice in COPYRIGHT
 
-cmake_minimum_required (VERSION 3.3.2 FATAL_ERROR)
 enable_language (ASM)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}) # for sub-projects
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -2,8 +2,6 @@
 # Copyright (C) 2020-2025 LuaVela Authors. See Copyright Notice in COPYRIGHT
 # Copyright (C) 2015-2020 IPONWEB Ltd. See Copyright Notice in COPYRIGHT
 
-cmake_minimum_required (VERSION 3.3.2 FATAL_ERROR)
-
 set(CMAKE_MODULE_PATH
   ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
 )
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -2,7 +2,6 @@
 # Copyright (C) 2020-2025 LuaVela Authors. See Copyright Notice in COPYRIGHT
 # Copyright (C) 2015-2020 IPONWEB Ltd. See Copyright Notice in COPYRIGHT
 
-cmake_minimum_required (VERSION 3.3.2 FATAL_ERROR)
 enable_language(C)
 
 include(MakeSourceList)

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`	`# Copyright (C) 2020-2025 LuaVela Authors. See Copyright Notice in COPYRIGHT`
`3`	`3`	`# Copyright (C) 2015-2020 IPONWEB Ltd. See Copyright Notice in COPYRIGHT`
`4`	`4`
`5`		`-cmake_minimum_required (VERSION 3.3.2 FATAL_ERROR)`
`6`		`-`
`7`	`5`	`set(CMAKE_MODULE_PATH`
`8`	`6`	`${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake"`
`9`	`7`	`)`