From 65ed29a0f96427bee6836ad511aec00b0cf40402 Mon Sep 17 00:00:00 2001 From: Christopher Chavez Date: Fri, 5 Nov 2021 17:57:57 -0500 Subject: [PATCH] Simplify by running sw_vers -productVersion --- cmake/package_name.cmake | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake index be1af896d515..6769b47f55ae 100644 --- a/cmake/package_name.cmake +++ b/cmake/package_name.cmake @@ -78,16 +78,13 @@ MACRO(GET_PACKAGE_FILE_NAME Var) # ProductVersion: 11.1 # BuildVersion: 20C69 - EXECUTE_PROCESS(COMMAND sw_vers - OUTPUT_VARIABLE SW_VERS_OUTPUT + EXECUTE_PROCESS(COMMAND sw_vers "-productVersion" + OUTPUT_VARIABLE SW_VERS_PRODUCTVERSION OUTPUT_STRIP_TRAILING_WHITESPACE ) - STRING(REPLACE "\n" ";" SW_VERS_OUTPUT_LIST "${SW_VERS_OUTPUT}") - LIST(GET SW_VERS_OUTPUT_LIST 0 SW_VERS_PRODUCTNAME) - LIST(GET SW_VERS_OUTPUT_LIST 1 SW_VERS_PRODUCTVERSION) STRING(REGEX MATCH - "ProductVersion:[\n\t ]*([0-9]+)\\.([0-9]+)" UNUSED ${SW_VERS_PRODUCTVERSION}) + "^([0-9]+)\\.([0-9]+)" UNUSED ${SW_VERS_PRODUCTVERSION}) IF(NOT CMAKE_MATCH_COUNT EQUAL 2) MESSAGE(FATAL_ERROR "Could not run sw_vers") ENDIF()