From 8e266517dac1541be4b836e57971484f18996845 Mon Sep 17 00:00:00 2001 From: Ryo Nakamura Date: Sun, 20 Nov 2022 02:01:44 +0900 Subject: use list(LENGTH) to iterate DIST_ lists --- CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 88d5109..55878a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,9 +53,7 @@ target_link_libraries(mscp PRIVATE ${MSCP_LINK_LIBS}) target_compile_options(mscp PRIVATE ${MSCP_COMPILE_OPTS}) target_compile_definitions(mscp PUBLIC _VERSION="${PROJECT_VERSION}") -install(TARGETS mscp - RUNTIME DESTINATION bin -) +install(TARGETS mscp RUNTIME DESTINATION bin) @@ -106,12 +104,15 @@ include(CPack) # Custom targets to build and test mscp in docker containers. # foreach(IN ZIP_LISTS) (cmake >= 3.17) can shorten the following lists. -# However, ubuntu 20.04 has cmake 3.16.3. +# However, ubuntu 20.04 has cmake 3.16.3. So this is a roundabout trick. list(APPEND DIST_NAMES ubuntu ubuntu centos rocky) list(APPEND DIST_VERS 20.04 22.04 8 8.6) list(APPEND DIST_PKGS deb deb rpm rpm) -foreach(x RANGE 3) +list(LENGTH DIST_NAMES _DIST_LISTLEN) +math(EXPR DIST_LISTLEN "${_DIST_LISTLEN} - 1") + +foreach(x RANGE ${DIST_LISTLEN}) list(GET DIST_NAMES ${x} DIST_NAME) list(GET DIST_VERS ${x} DIST_VER) list(GET DIST_PKGS ${x} DIST_PKG) -- cgit v1.2.3