mirror of https://github.com/aminya/setup-cpp
Merge pull request #83 from aminya/doxygen-win [skip ci]
fix: fix doxygen installation path on windows
This commit is contained in:
commit
bf5e374768
|
@ -15,4 +15,5 @@ temp-*
|
||||||
!./dist/setup_cpp.js
|
!./dist/setup_cpp.js
|
||||||
!./dist/setup_cpp.js.map
|
!./dist/setup_cpp.js.map
|
||||||
.parcel-cache
|
.parcel-cache
|
||||||
exe
|
*.log
|
||||||
|
*.exe
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -9,6 +9,7 @@ import { notice } from "../utils/io/io"
|
||||||
import { setupGraphviz } from "../graphviz/graphviz"
|
import { setupGraphviz } from "../graphviz/graphviz"
|
||||||
import { getVersion } from "../default_versions"
|
import { getVersion } from "../default_versions"
|
||||||
import { existsSync } from "fs"
|
import { existsSync } from "fs"
|
||||||
|
import { join } from "path"
|
||||||
|
|
||||||
/** Get the platform data for cmake */
|
/** Get the platform data for cmake */
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||||
|
@ -80,7 +81,7 @@ async function activateWinDoxygen() {
|
||||||
"C:/Program Files/doxygen/bin",
|
"C:/Program Files/doxygen/bin",
|
||||||
"C:/Program Files (x86)/doxygen",
|
"C:/Program Files (x86)/doxygen",
|
||||||
]) {
|
]) {
|
||||||
if (existsSync(binDir)) {
|
if (existsSync(join(binDir, "doxygen.exe"))) {
|
||||||
// eslint-disable-next-line no-await-in-loop
|
// eslint-disable-next-line no-await-in-loop
|
||||||
await addPath(binDir)
|
await addPath(binDir)
|
||||||
return binDir
|
return binDir
|
||||||
|
|
|
@ -10,7 +10,7 @@ jest.setTimeout(3000000)
|
||||||
describe("setup-gcc", () => {
|
describe("setup-gcc", () => {
|
||||||
let directory: string
|
let directory: string
|
||||||
beforeAll(async () => {
|
beforeAll(async () => {
|
||||||
directory = await setupTmpDir("doxygen")
|
directory = await setupTmpDir("gcc")
|
||||||
})
|
})
|
||||||
|
|
||||||
it("should setup gcc", async () => {
|
it("should setup gcc", async () => {
|
||||||
|
@ -37,6 +37,6 @@ describe("setup-gcc", () => {
|
||||||
})
|
})
|
||||||
|
|
||||||
afterAll(async () => {
|
afterAll(async () => {
|
||||||
await cleanupTmpDir("doxygen")
|
await cleanupTmpDir("gcc")
|
||||||
}, 100000)
|
}, 100000)
|
||||||
})
|
})
|
||||||
|
|
|
@ -8,11 +8,14 @@
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
#include <cmath>
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
const auto x = 10.0;
|
const auto val1 = 10.0;
|
||||||
std::cout << "Testing " << x << '\n';
|
std::cout << "Testing " << val1 << '\n';
|
||||||
|
|
||||||
const auto y = std::to_string(x);
|
const auto val2 = std::to_string(val1);
|
||||||
std::cout << "Testing " << y << '\n';
|
std::cout << "Testing " << val2 << '\n';
|
||||||
|
|
||||||
|
return static_cast<int>(std::sin(val1) + std::log(static_cast<double>(val2.size())) - 1);
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
|
@ -8,11 +8,14 @@
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
#include <cmath>
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
const auto x = 10.0;
|
const auto val1 = 10.0;
|
||||||
std::cout << "Testing " << x << '\n';
|
std::cout << "Testing " << val1 << '\n';
|
||||||
|
|
||||||
const auto y = std::to_string(x);
|
const auto val2 = std::to_string(val1);
|
||||||
std::cout << "Testing " << y << '\n';
|
std::cout << "Testing " << val2 << '\n';
|
||||||
|
|
||||||
|
return static_cast<int>(std::sin(val1) + std::log(static_cast<double>(val2.size())) - 1);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue