From d88fd12c26547e4e2926fea32ade881d5f15e3c3 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 23 May 2022 08:31:57 +0800 Subject: [PATCH] SRT: Fix cmake bug, quit if error. --- trunk/auto/depends.sh | 8 +++----- trunk/ide/srs_clion/CMakeLists.txt | 11 +++++++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 87bf940fb..f40bd6456 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -253,11 +253,9 @@ function OSX_prepare() echo "OSX detected, install tools if needed" - brew --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then - echo "install brew" - echo "ruby -e \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)\"" - ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"; ret=$?; if [[ 0 -ne $ret ]]; then return $ret; fi - echo "install brew success" + brew --version >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then + echo "Please install brew at https://brew.sh/" + exit $ret fi gcc --help >/dev/null 2>&1; ret=$?; if [[ 0 -ne $ret ]]; then diff --git a/trunk/ide/srs_clion/CMakeLists.txt b/trunk/ide/srs_clion/CMakeLists.txt index 6503e37ee..d5c4cd750 100755 --- a/trunk/ide/srs_clion/CMakeLists.txt +++ b/trunk/ide/srs_clion/CMakeLists.txt @@ -26,10 +26,17 @@ ProcessorCount(JOBS) # We should always configure SRS for switching between branches. IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - EXEC_PROGRAM("cd ${SRS_DIR} && ./configure --osx --srt=on --utest=on --jobs=${JOBS}") + EXECUTE_PROCESS( + COMMAND ./configure --osx --srt=on --utest=on --jobs=${JOBS} + WORKING_DIRECTORY ${SRS_DIR} RESULT_VARIABLE ret) ELSE () - EXEC_PROGRAM("cd ${SRS_DIR} && ./configure --srt=on --utest=on --jobs=${JOBS}") + EXECUTE_PROCESS( + COMMAND ./configure --srt=on --utest=on --jobs=${JOBS} + WORKING_DIRECTORY ${SRS_DIR} RESULT_VARIABLE ret) ENDIF () +if(NOT ret EQUAL 0) + message(FATAL_ERROR "FAILED: ${ret}") +endif() set(DEPS_LIBS ${SRS_DIR}/objs/st/libst.a ${SRS_DIR}/objs/openssl/lib/libssl.a