File tree Expand file tree Collapse file tree 4 files changed +9
-5
lines changed Expand file tree Collapse file tree 4 files changed +9
-5
lines changed Original file line number Diff line number Diff line change 12
12
fail-fast : false
13
13
matrix :
14
14
include :
15
- - container : wpilib/roborio-cross-ubuntu:2023 -22.04
15
+ - container : wpilib/roborio-cross-ubuntu:2024 -22.04
16
16
artifact-name : Athena
17
17
build-options : " -Pplatform=linux-athena"
18
18
- container : wpilib/raspbian-cross-ubuntu:bullseye-22.04
Original file line number Diff line number Diff line change 1
1
set (GCC_COMPILER_VERSION "" CACHE STRING "GCC Compiler version" )
2
- set (GNU_MACHINE "arm-frc2023 -linux-gnueabi" CACHE STRING "GNU compiler triple" )
2
+ set (GNU_MACHINE "arm-frc2024 -linux-gnueabi" CACHE STRING "GNU compiler triple" )
3
3
set (SOFTFP yes )
4
4
set (ARM_LINUX_SYSROOT /usr/local/arm-nilrt-linux-gnueabi/sysroot )
5
5
include ("${CMAKE_CURRENT_LIST_DIR} /opencv/platforms/linux/arm.toolchain.cmake" )
Original file line number Diff line number Diff line change @@ -183,8 +183,8 @@ def stripExe = 'strip'
183
183
def objCopyExe = ' objcopy'
184
184
185
185
if (project. platform == " linux-athena" ) {
186
- stripExe = ' arm-frc2023 -linux-gnueabi-strip'
187
- objCopyExe = ' arm-frc2023 -linux-gnueabi-objcopy'
186
+ stripExe = ' arm-frc2024 -linux-gnueabi-strip'
187
+ objCopyExe = ' arm-frc2024 -linux-gnueabi-objcopy'
188
188
} else if (project. platform == " linux-arm32" ) {
189
189
stripExe = ' armv6-bullseye-linux-gnueabihf-strip'
190
190
objCopyExe = ' armv6-bullseye-linux-gnueabihf-objcopy'
@@ -210,6 +210,10 @@ if (project.platform == "linux-athena") {
210
210
def args = defaultCmakeArgs
211
211
if (buildType. contains(" Shared" )) {
212
212
args = args + ' -DBUILD_SHARED_LIBS=ON' + ' -DOPENCV_DEBUG_POSTFIX=d'
213
+
214
+ if (project. platform. contains(' windows' )) {
215
+ args = args + ' -DCMAKE_SHARED_LINKER_FLAGS=/DEPENDENTLOADFLAG:0x1100'
216
+ }
213
217
} else {
214
218
args = args + ' -DBUILD_SHARED_LIBS=OFF'
215
219
}
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ publishing {
13
13
}
14
14
}
15
15
16
- def pubVersion = " ${ project.ext.version} -2 "
16
+ def pubVersion = " ${ project.ext.version} -3 "
17
17
18
18
def outputsFolder = file(" $project . buildDir /outputs" )
19
19
You can’t perform that action at this time.
0 commit comments