f1x1t/cmake-generators
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: f1x1t:c04395ef98c3973caf41a67de8263018d82c6c5e
Branches Tags
f1x1t:master
...
compare: f1x1t:6630d0c2325521778658608c4c67269b4949098a
Branches Tags
f1x1t:master

2 Commits
c04395ef98 ... 6630d0c232

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
1 changed files with 2 additions and 5 deletions
Expand all files Collapse all files

7
cmake.sh
View File

@@ -127,12 +127,10 @@ generate_configuration() {
fi fi
fi fi
mkdir -p "${GEN_DIR}" cmake -B"${GEN_DIR}" -H"${SOURCE_DIR}" -G "${GENERATOR}" -DCMAKE_INSTALL_PREFIX="${OUTPUT_DIR}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" ${CMAKE_ARGS}
pushd "${GEN_DIR}" 2>/dev/null
cmake -G "${GENERATOR}" -DCMAKE_INSTALL_PREFIX="${OUTPUT_DIR}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" ${CMAKE_ARGS} "${SOURCE_DIR}"
if [ "x$GENERATOR" == "xNinja" ]; then if [ "x$GENERATOR" == "xNinja" ]; then
# Generate fake Makefile, so make can run ninja build # Generate fake Makefile, so make can run ninja build
cat > Makefile <<EOF cat > "${GEN_DIR}/Makefile" <<EOF
.PHONY: build .PHONY: build
%: %:
@ninja \$@ @ninja \$@
@@ -140,7 +138,6 @@ build:
@ninja @ninja
EOF EOF
fi fi
popd 2>/dev/null
} }
export -f generate_configuration export -f generate_configuration