Правка пути к создаваемому Makefile

Вызов CMake с ключами -B и -H
2019-11-29 11:34:27 +03:00 · 2019-11-27 16:18:37 +03:00
1 changed files with 2 additions and 5 deletions
--- a/cmake.sh
+++ b/cmake.sh
@@ -127,12 +127,10 @@ 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 <<EOF
+		cat > "${GEN_DIR}/Makefile" <<EOF
 .PHONY: build
 %:
 	@ninja \$@
@@ -140,7 +138,6 @@ build:
 	@ninja
 EOF
 	fi
-	popd 2>/dev/null
 }

 export -f generate_configuration
Author	SHA1	Message	Date
Andrey Astafyev	6630d0c232	Правка пути к создаваемому Makefile	2019-11-29 11:34:27 +03:00
Andrey Astafyev	9952d86269	Вызов CMake с ключами -B и -H	2019-11-27 16:18:37 +03:00