dependency installer script update

don't print "Installing GoogleTest" if not installing GoogleTest

Author: calccrypto

CMakeLists.txt

@@ -287,7 +287,7 @@ endif()
 if (DEP_USE_JEMALLOC)
   set(DEP_OPTIONS ${DEP_OPTIONS} --jemalloc)
 endif()
-add_custom_target(install_dependencies ALL COMMAND ${CMAKE_SOURCE_DIR}/contrib/deps/install_deps.sh ${DEP_OPTIONS} "${DEP_DOWNLOAD_PREFIX}" "${DEP_BUILD_PREFIX}" "${DEP_INSTALL_PREFIX}")
+add_custom_target(install_dependencies ALL COMMAND ${CMAKE_SOURCE_DIR}/contrib/deps/install_deps.sh ${DEP_OPTIONS} "${DEP_DOWNLOAD_PREFIX}" "${DEP_BUILD_PREFIX}" "${DEP_INSTALL_PREFIX}" "${CMAKE_VERSION}" "${CMAKE_SYSTEM_NAME}")
 
 # Find zlib
 pkg_search_module(ZLIB zlib)

contrib/deps/install_deps.sh

@@ -118,16 +118,25 @@ if [[ "$#" -lt 3 ]]; then
     exit 1
 fi
 
+if [[ "$#" -lt 5 ]]
+then
+    echo "Syntax: $0 download_dir build_dir install_dir CMAKE_VERSION CMAKE_SYSTEM_NAME" >&2
+    exit 1
+fi
+
 # dependency download path
-mkdir -p "$1"
-DOWNLOAD_DIR=$(realpath "$1")
+DOWNLOAD_DIR=$(realpath -m "$1")
+mkdir -p "${DOWNLOAD_DIR}"
 
-mkdir -p "$2"
-BUILD_DIR=$(realpath "$2")
+BUILD_DIR=$(realpath -m "$2")
+mkdir -p "${BUILD_DIR}"
 
 # dependency install path
-mkdir -p "$3"
-INSTALL_DIR=$(realpath "$3")
+INSTALL_DIR=$(realpath -m "$3")
+mkdir -p "${INSTALL_DIR}"
+
+CMAKE_VERSION="$4"
+CMAKE_SYSTEM_NAME="$5"
 
 export SCRIPT_PATH
 export DOWNLOAD_DIR
@@ -147,13 +156,14 @@ if [[ "${JEMALLOC}" == "true" ]]; then
     source "${SCRIPT_PATH}/jemalloc.sh"
 fi
 
-CMAKE_VERSION=$(cmake --version | head -n 1 | awk '{ print $3 }' )
 ACCEPTABLE_VERSION=3.5
 HIGHEST_VERSION=$( (echo "${CMAKE_VERSION}"; echo "${ACCEPTABLE_VERSION}") | sort -rV | head -1)
 
-if [[ "${CMAKE_VERSION}" == "${HIGHEST_VERSION}" ]]; then
-    if [[ "${BUILD_CXX}" == "true" ]]; then
-        echo "Installing GoogleTest"
-        source "${SCRIPT_PATH}/googletest.sh"
+if [[ "${CMAKE_SYSTEM_NAME}" != "CYGWIN" ]]; then
+    if [[ "${CMAKE_VERSION}" == "${HIGHEST_VERSION}" ]]; then
+        if [[ "${BUILD_CXX}" == "true" ]]; then
+            echo "Installing GoogleTest"
+            source "${SCRIPT_PATH}/googletest.sh"
+        fi
     fi
 fi