From 9952d8626933a1003f90395a90946934dd254f48 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 27 Nov 2019 16:18:37 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=B7=D0=BE=D0=B2=20CMake=20=D1=81?= =?UTF-8?q?=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B0=D0=BC=D0=B8=20-B=20=D0=B8=20-?= =?UTF-8?q?H?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cmake.sh b/cmake.sh index 853b32c..91aa052 100755 --- a/cmake.sh +++ b/cmake.sh @@ -127,9 +127,7 @@ generate_configuration() { fi fi - mkdir -p "${GEN_DIR}" - pushd "${GEN_DIR}" 2>/dev/null - cmake -G "${GENERATOR}" -DCMAKE_INSTALL_PREFIX="${OUTPUT_DIR}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" ${CMAKE_ARGS} "${SOURCE_DIR}" + cmake -B"${GEN_DIR}" -H"${SOURCE_DIR}" -G "${GENERATOR}" -DCMAKE_INSTALL_PREFIX="${OUTPUT_DIR}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" ${CMAKE_ARGS} if [ "x$GENERATOR" == "xNinja" ]; then # Generate fake Makefile, so make can run ninja build cat > Makefile </dev/null } export -f generate_configuration