Skip to content
This repository was archived by the owner on Apr 8, 2024. It is now read-only.

Commit fc75580

Browse files
committed
Azure fix for linux build
1 parent 40ba40e commit fc75580

File tree

3 files changed

+31
-11
lines changed

3 files changed

+31
-11
lines changed

Core/src/latest/main/cpp/ImageProcessing/ColourFilter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@ namespace CJ {
7878
cv::createTrackbar("Binary Thresh High", windowName, &options.binaryThreshold_High, 255);
7979
#endif
8080
}
81-
};
81+
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ task generateFramework {
7575
build.dependsOn(preBuild)
7676
if (isFamily(FAMILY_WINDOWS) || project.hasProperty("azureBuild")) { // windows config
7777
task runVision(dependsOn: "simulateCjVision${wpi.platforms.desktop.capitalize()}DebugExecutable")
78-
} else if (isFamily(FAMILY_UNIX) || isFamily(FAMILY_MAC)) { // linux config
78+
} else if (isFamily(FAMILY_UNIX) || isFamily(FAMILY_MAC)) { // unix config
7979
clean.dependsOn(cleanUNIX)
8080
build.finalizedBy(buildVisionUNIX) // finalize if linux/unix
8181
runVisionUNIX.dependsOn(buildVisionUNIX) // run depends on build

locations.gradle

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
import static org.apache.tools.ant.taskdefs.condition.Os.*
2+
apply from: rootProject.file("platforms/platform.gradle")
3+
14
//
25
// Local Locations and directories
36
//
@@ -28,19 +31,36 @@ rootProject.ext.set("coproc_vision_headers", ["$coproc_vision_main/include"])
2831
//
2932
// Libs folders
3033
//
31-
// rootProject.ext.set("libs_src", [
32-
// " "
33-
// ])
34-
35-
rootProject.ext.set("libs_headers", [
36-
"$cj_vision_common_dir/libs/UDP_TransferNT/UDP_TransferNT/include",
37-
"$cj_vision_common_dir/libs/spdlog/include"
38-
])
34+
if (isFamily(FAMILY_UNIX)) {
35+
rootProject.ext.set("libs_src", [
36+
"$cj_vision_common_dir/libs/MJPEGWriter/main/cpp"
37+
])
38+
}
3939

40+
//
41+
// Libs header locations
42+
//
43+
if (isFamily(FAMILY_UNIX)) {
44+
rootProject.ext.set("libs_headers", [
45+
"$cj_vision_common_dir/libs/UDP_TransferNT/UDP_TransferNT/include",
46+
"$cj_vision_common_dir/libs/spdlog/include",
47+
"$cj_vision_common_dir/libs/MJPEGWriter/main/include"
48+
])
49+
} else {
50+
rootProject.ext.set("libs_headers", [
51+
"$cj_vision_common_dir/libs/UDP_TransferNT/UDP_TransferNT/include",
52+
"$cj_vision_common_dir/libs/spdlog/include"
53+
])
54+
}
4055

4156

4257
// Src/headers
43-
rootProject.ext.set("vision_all_src", cj_vision_src + coproc_vision_src /*+ libs_src*/)
58+
if (isFamily(FAMILY_UNIX)) {
59+
rootProject.ext.set("vision_all_src", cj_vision_src + coproc_vision_src + libs_src)
60+
} else {
61+
rootProject.ext.set("vision_all_src", cj_vision_src + coproc_vision_src /*+ libs_src*/)
62+
}
63+
4464
rootProject.ext.set("vision_all_headers", cj_vision_headers + coproc_vision_headers + libs_headers)
4565

4666

0 commit comments

Comments
 (0)