Merge pull request #16833 from gottesmm/pr-36d7415d3531d61aabb8231290000c5797d2bf8e
diff --git a/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake b/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake
index e5764b7..ee9286b 100644
--- a/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake
+++ b/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake
@@ -2,24 +2,6 @@
include(CMakeParseArguments)
include(SwiftBenchmarkUtils)
-# Run a shell command and assign output to a variable or fail with an error.
-# Example usage:
-# runcmd(COMMAND "xcode-select" "-p"
-# VARIABLE xcodepath
-# ERROR "Unable to find current Xcode path")
-function(runcmd)
- cmake_parse_arguments(RUNCMD "" "VARIABLE;ERROR" "COMMAND" ${ARGN})
- execute_process(
- COMMAND ${RUNCMD_COMMAND}
- OUTPUT_VARIABLE ${RUNCMD_VARIABLE}
- RESULT_VARIABLE result
- ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(NOT "${result}" MATCHES "0")
- message(FATAL_ERROR "${RUNCMD_ERROR}")
- endif()
- set(${RUNCMD_VARIABLE} ${${RUNCMD_VARIABLE}} PARENT_SCOPE)
-endfunction(runcmd)
-
function (add_swift_benchmark_library objfile_out sibfile_out)
cmake_parse_arguments(BENCHLIB "" "MODULE_PATH;SOURCE_DIR;OBJECT_DIR" "SOURCES;LIBRARY_FLAGS;DEPENDS" ${ARGN})
diff --git a/benchmark/cmake/modules/SwiftBenchmarkUtils.cmake b/benchmark/cmake/modules/SwiftBenchmarkUtils.cmake
index 9c5e6a0..d457bac 100644
--- a/benchmark/cmake/modules/SwiftBenchmarkUtils.cmake
+++ b/benchmark/cmake/modules/SwiftBenchmarkUtils.cmake
@@ -43,3 +43,22 @@
set("${var_name}" "" PARENT_SCOPE)
endif()
endfunction()
+
+
+# Run a shell command and assign output to a variable or fail with an error.
+# Example usage:
+# runcmd(COMMAND "xcode-select" "-p"
+# VARIABLE xcodepath
+# ERROR "Unable to find current Xcode path")
+function(runcmd)
+ cmake_parse_arguments(RUNCMD "" "VARIABLE;ERROR" "COMMAND" ${ARGN})
+ execute_process(
+ COMMAND ${RUNCMD_COMMAND}
+ OUTPUT_VARIABLE ${RUNCMD_VARIABLE}
+ RESULT_VARIABLE result
+ ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if(NOT "${result}" MATCHES "0")
+ message(FATAL_ERROR "${RUNCMD_ERROR}")
+ endif()
+ set(${RUNCMD_VARIABLE} ${${RUNCMD_VARIABLE}} PARENT_SCOPE)
+endfunction(runcmd)
