Compare commits

...

2 Commits

2 changed files with 1 additions and 11 deletions

View File

@ -137,16 +137,6 @@ generate_configuration() {
fi fi
cmake -B"${GEN_DIR}" -H"${SOURCE_DIR}" -G "${GENERATOR}" -DCMAKE_INSTALL_PREFIX="${OUTPUT_DIR}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" ${CMAKE_ARGS} 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 > "${GEN_DIR}/Makefile" <<EOF
.PHONY: build
%:
@ninja \$@
build:
@ninja
EOF
fi
} }
export -f generate_configuration export -f generate_configuration

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
PROJECT=$(grep -i "^Project" "$(dirname -- "$(dirname -- "$(pwd)")")/CMakeLists.txt" | awk -F'[()]' '{print $2}') PROJECT=$(grep -i "^Project" "$(dirname -- "$(dirname -- "$(pwd)")")/CMakeLists.txt" | awk -F'[( )]' '{print $2}')
"$(dirname $0)/cmake.sh" -f -t qtDebug "$(dirname $0)/cmake.sh" -f -t qtDebug