diff options
| author | Alex Turbov <i.zaufi@gmail.com> | 2022-08-21 02:00:05 +0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-09-22 09:24:46 -0400 |
| commit | a509602699eb83fbbea67244051c8a18f708a6ae (patch) | |
| tree | 94dc40d7c2f27d428e3e421a079fdb9c74ca29e3 /CMakeLists.txt | |
| parent | 914d21de58094d461c9f86738136fb034a691113 (diff) | |
| download | cmake-a509602699eb83fbbea67244051c8a18f708a6ae.tar.gz | |
Build: Modernize some `foreach` calls to use `IN LISTS`/`IN ITEMS`
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d77dfc402..3d26ba9196 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,8 +17,8 @@ unset(CMAKE_USER_MAKE_RULES_OVERRIDE_C) if(MSVC AND NOT CMAKE_VERSION VERSION_LESS 3.15) # Filter out MSVC runtime library flags that may have come from # the cache of an existing build tree or from scripts. - foreach(l C CXX) - foreach(c DEBUG MINSIZEREL RELEASE RELWITHDEBINFO) + foreach(l IN ITEMS C CXX) + foreach(c IN ITEMS DEBUG MINSIZEREL RELEASE RELWITHDEBINFO) string(REGEX REPLACE "[-/]M[DT]d?( |$)" "" "CMAKE_${l}_FLAGS_${c}" "${CMAKE_${l}_FLAGS_${c}}") endforeach() endforeach() @@ -165,7 +165,7 @@ macro(CMAKE_HANDLE_SYSTEM_LIBRARIES) # Allow the user to enable/disable all system utility library options by # defining CMAKE_USE_SYSTEM_LIBRARIES or CMAKE_USE_SYSTEM_LIBRARY_${util}. set(UTILITIES BZIP2 CURL EXPAT FORM JSONCPP LIBARCHIVE LIBLZMA LIBRHASH LIBUV NGHTTP2 ZLIB ZSTD) - foreach(util ${UTILITIES}) + foreach(util IN LISTS UTILITIES) if(NOT DEFINED CMAKE_USE_SYSTEM_LIBRARY_${util} AND DEFINED CMAKE_USE_SYSTEM_LIBRARIES) set(CMAKE_USE_SYSTEM_LIBRARY_${util} "${CMAKE_USE_SYSTEM_LIBRARIES}") @@ -215,7 +215,7 @@ macro(CMAKE_HANDLE_SYSTEM_LIBRARIES) mark_as_advanced(CMAKE_USE_SYSTEM_KWIML) # Mention to the user what system libraries are being used. - foreach(util ${UTILITIES} KWIML) + foreach(util IN LISTS UTILITIES ITEMS KWIML) if(CMAKE_USE_SYSTEM_${util}) message(STATUS "Using system-installed ${util}") endif() @@ -235,7 +235,7 @@ endmacro() macro(CMAKE_SETUP_TESTING) if(BUILD_TESTING) set(CMAKE_TEST_SYSTEM_LIBRARIES 0) - foreach(util CURL EXPAT ZLIB) + foreach(util IN ITEMS CURL EXPAT ZLIB) if(CMAKE_USE_SYSTEM_${util}) set(CMAKE_TEST_SYSTEM_LIBRARIES 1) endif() @@ -250,7 +250,7 @@ macro(CMAKE_SETUP_TESTING) set(CMAKE_CTEST_COMMAND "${CMake_TEST_EXTERNAL_CMAKE}/ctest") set(CMAKE_CMAKE_COMMAND "${CMake_TEST_EXTERNAL_CMAKE}/cmake") set(CMAKE_CPACK_COMMAND "${CMake_TEST_EXTERNAL_CMAKE}/cpack") - foreach(exe cmake ctest cpack) + foreach(exe IN ITEMS cmake ctest cpack) add_executable(${exe} IMPORTED) set_property(TARGET ${exe} PROPERTY IMPORTED_LOCATION ${CMake_TEST_EXTERNAL_CMAKE}/${exe}) endforeach() @@ -860,8 +860,8 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE) -Wshadow -Wpointer-arith -Wformat-security -Wundef ) - foreach(FLAG_LANG C CXX) - foreach(FLAG ${${FLAG_LANG}_FLAGS_LIST}) + foreach(FLAG_LANG IN ITEMS C CXX) + foreach(FLAG IN LISTS ${FLAG_LANG}_FLAGS_LIST) if(NOT " ${CMAKE_${FLAG_LANG}_FLAGS} " MATCHES " ${FLAG} ") set(CMAKE_${FLAG_LANG}_FLAGS "${CMAKE_${FLAG_LANG}_FLAGS} ${FLAG}") endif() |