Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-05 03:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix simulation build with latest ntcore/wpiutil. (#250)

Browse Source
This commit is contained in:
Peter Johnson
2016-09-28 20:45:03 -07:00
committed by GitHub
parent 5dfae8d6bd
commit 81e63ea3a5
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wpilibc/sim/CMakeLists.txt
View File

@@ -9,17 +9,18 @@ set (INCLUDE_FOLDERS include
../shared/include
../../hal/include
${NTCORE_INCLUDE_DIR}
${WPIUTIL_INCLUDE_DIR}
${GZ_MSGS_INCLUDE_DIR}
${Boost_INCLUDE_DIR}
${GAZEBO_INCLUDE_DIRS})
include_directories(${INCLUDE_FOLDERS})
link_directories(${NTCORE_LIBDIR})
link_directories(${NTCORE_LIBDIR} ${WPIUTIL_LIBDIR})
add_library(${PROJECT_NAME} SHARED ${SRC_FILES} ${COM_SRC_FILES})
target_link_libraries(${PROJECT_NAME} ntcore)
target_link_libraries(${PROJECT_NAME} ntcore wpiutil)
set_target_properties(${PROJECT_NAME}
PROPERTIES

10
wpilibc/simulation.gradle
View File

@@ -16,12 +16,16 @@ task cmake(type: Exec, dependsOn: setupCmake) {
commandLine '../configure.bat',
"-DNTCORE_INCLUDE_DIR=$netTablesInclude",
"-DNTCORE_LIBDIR=$netLibDesktopLocation",
"-DWPIUTIL_INCLUDE_DIR=$wpiUtilInclude",
"-DWPIUTIL_LIBDIR=$wpiUtilLibDesktopLocation",
"-DSIMULATION_INSTALL_DIR=$simulationInstallDir"
}
else {
commandLine 'cmake', '..',
"-DNTCORE_INCLUDE_DIR=$netTablesInclude",
"-DNTCORE_LIBDIR=$netLibDesktopLocation",
"-DWPIUTIL_INCLUDE_DIR=$wpiUtilInclude",
"-DWPIUTIL_LIBDIR=$wpiUtilLibDesktopLocation",
"-DSIMULATION_INSTALL_DIR=$simulationInstallDir"
}
}
@@ -50,7 +54,7 @@ task gz_msgs(type: Exec, dependsOn: cmake) {
}
}
task wpilibcSim(type: Exec, dependsOn: ['cmake', ':unzipNetworkTables']) {
task wpilibcSim(type: Exec, dependsOn: ['cmake', ':unzipNetworkTables', ':unzipWpiUtil']) {
description = 'build WPILib C++ for simulation with cmake'
group = 'WPILib Simulation'
workingDir '../build'
@@ -95,6 +99,10 @@ task wpilibcSimCopy(type: Copy, dependsOn: allcsim) {
from ("$netLibDesktopLocation/libntcore.so") {
into "lib"
}
from ("$wpiUtilLibDesktopLocation/libwpiutil.so") {
into "lib"
}
}
build.dependsOn allcsim