Created
October 20, 2015 07:36
-
-
Save syohex/dbbe8b11f8340125e678 to your computer and use it in GitHub Desktop.
Autoware patch for building on Ubuntu 14.04 32bit
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/ros/src/computing/perception/detection/packages/road_wizard/CMakeLists.txt b/ros/src/computing/perception/detection/packages/road_wizard/CMakeLists.txt | |
index 005bdcb..05bea85 100644 | |
--- a/ros/src/computing/perception/detection/packages/road_wizard/CMakeLists.txt | |
+++ b/ros/src/computing/perception/detection/packages/road_wizard/CMakeLists.txt | |
@@ -42,6 +42,12 @@ set(CMAKE_CXX_FLAGS "-std=c++0x -O2 -Wall ${CMAKE_CXX_FLAGS}") | |
## Build ## | |
########### | |
+EXECUTE_PROCESS( | |
+ COMMAND uname -m | |
+ OUTPUT_VARIABLE ARCHITECTURE | |
+ OUTPUT_STRIP_TRAILING_WHITESPACE | |
+) | |
+ | |
### region_tlr ### | |
add_executable(region_tlr | |
nodes/region_tlr/region_tlr.cpp | |
@@ -87,8 +93,14 @@ set(Qt5LIBROOT "/usr/local/qtbase5/lib") | |
else() | |
# Ubuntu Qt5 package | |
set(Qt5INCLUDE "/usr/include/qt5") | |
+if("${ARCHITECTURE}" STREQUAL "x86_64") | |
set(Qt5BIN "/usr/lib/x86_64-linux-gnu/qt5/bin") | |
set(Qt5LIBROOT "/usr/lib/x86_64-linux-gnu") | |
+elseif("${ARCHITECTURE}" STREQUAL "i686") | |
+set(Qt5BIN "/usr/lib/i386-linux-gnu/qt5/bin") | |
+set(Qt5LIBROOT "/usr/lib/i386-linux-gnu") | |
+endif() | |
+ | |
endif() | |
include_directories( | |
@@ -141,4 +153,4 @@ target_link_libraries(tlr_tuner | |
${Qt5LIBROOT}/libQt5Gui.so | |
${Qt5LIBROOT}/libQt5OpenGL.so | |
${Qt5LIBROOT}/libQt5Widgets.so | |
- ) | |
\ No newline at end of file | |
+ ) | |
diff --git a/ros/src/sensing/fusion/packages/calibration_camera_lidar/CMakeLists.txt b/ros/src/sensing/fusion/packages/calibration_camera_lidar/CMakeLists.txt | |
index ea50e5b..5a65d23 100644 | |
--- a/ros/src/sensing/fusion/packages/calibration_camera_lidar/CMakeLists.txt | |
+++ b/ros/src/sensing/fusion/packages/calibration_camera_lidar/CMakeLists.txt | |
@@ -35,6 +35,12 @@ catkin_package( | |
set(CMAKE_CXX_FLAGS "-std=c++0x -O2 -Wall -g -Wno-unused-result ${CMAKE_CXX_FLAGS}") | |
+EXECUTE_PROCESS( | |
+ COMMAND uname -m | |
+ OUTPUT_VARIABLE ARCHITECTURE | |
+ OUTPUT_STRIP_TRAILING_WHITESPACE | |
+) | |
+ | |
if(EXISTS /usr/local/qtbase5) | |
# Self install version | |
set(Qt5INCLUDE "/usr/local/qtbase5/include") | |
@@ -43,8 +49,14 @@ set(Qt5LIBROOT "/usr/local/qtbase5/lib") | |
else() | |
# Ubuntu Qt5 package | |
set(Qt5INCLUDE "/usr/include/qt5") | |
+if("${ARCHITECTURE}" STREQUAL "x86_64") | |
set(Qt5BIN "/usr/lib/x86_64-linux-gnu/qt5/bin") | |
set(Qt5LIBROOT "/usr/lib/x86_64-linux-gnu") | |
+elseif("${ARCHITECTURE}" STREQUAL "i686") | |
+set(Qt5BIN "/usr/lib/i386-linux-gnu/qt5/bin") | |
+set(Qt5LIBROOT "/usr/lib/i386-linux-gnu") | |
+endif() | |
+ | |
endif() | |
## Specify additional locations of header files | |
@@ -197,4 +209,4 @@ add_dependencies(calibration_publisher | |
target_link_libraries(calibration_publisher | |
${catkin_LIBRARIES} | |
- ) | |
\ No newline at end of file | |
+ ) | |
diff --git a/ros/src/sensing/fusion/packages/points2image/CMakeLists.txt b/ros/src/sensing/fusion/packages/points2image/CMakeLists.txt | |
index b7f7926..a1ee2e4 100644 | |
--- a/ros/src/sensing/fusion/packages/points2image/CMakeLists.txt | |
+++ b/ros/src/sensing/fusion/packages/points2image/CMakeLists.txt | |
@@ -46,6 +46,12 @@ catkin_package( | |
SET(CMAKE_CXX_FLAGS "-std=c++0x -O2 -g -Wall -Wno-unused-result ${CMAKE_CXX_FLAGS}") | |
+EXECUTE_PROCESS( | |
+ COMMAND uname -m | |
+ OUTPUT_VARIABLE ARCHITECTURE | |
+ OUTPUT_STRIP_TRAILING_WHITESPACE | |
+) | |
+ | |
if(EXISTS /usr/local/qtbase5) | |
# Self install version | |
set(Qt5INCLUDE "/usr/local/qtbase5/include") | |
@@ -54,8 +60,14 @@ set(Qt5LIBROOT "/usr/local/qtbase5/lib") | |
else() | |
# Ubuntu Qt5 package | |
set(Qt5INCLUDE "/usr/include/qt5") | |
+if("${ARCHITECTURE}" STREQUAL "x86_64") | |
set(Qt5BIN "/usr/lib/x86_64-linux-gnu/qt5/bin") | |
set(Qt5LIBROOT "/usr/lib/x86_64-linux-gnu") | |
+elseif("${ARCHITECTURE}" STREQUAL "i686") | |
+set(Qt5BIN "/usr/lib/i386-linux-gnu/qt5/bin") | |
+set(Qt5LIBROOT "/usr/lib/i386-linux-gnu") | |
+endif() | |
+ | |
endif() | |
include_directories( | |
diff --git a/ros/src/util/packages/RobotSDK/fastvirtualscan/CMakeLists.txt b/ros/src/util/packages/RobotSDK/fastvirtualscan/CMakeLists.txt | |
index de4a2c9..84367a5 100644 | |
--- a/ros/src/util/packages/RobotSDK/fastvirtualscan/CMakeLists.txt | |
+++ b/ros/src/util/packages/RobotSDK/fastvirtualscan/CMakeLists.txt | |
@@ -18,6 +18,12 @@ catkin_package( | |
SET(CMAKE_CXX_FLAGS "-std=c++0x -O2 -g -Wall -Wno-unused-result ${CMAKE_CXX_FLAGS}") | |
+EXECUTE_PROCESS( | |
+ COMMAND uname -m | |
+ OUTPUT_VARIABLE ARCHITECTURE | |
+ OUTPUT_STRIP_TRAILING_WHITESPACE | |
+) | |
+ | |
if(EXISTS /usr/local/qtbase5) | |
# Self install version | |
set(Qt5INCLUDE "/usr/local/qtbase5/include") | |
@@ -26,8 +32,14 @@ set(Qt5LIBROOT "/usr/local/qtbase5/lib") | |
else() | |
# Ubuntu Qt5 package | |
set(Qt5INCLUDE "/usr/include/qt5") | |
+if("${ARCHITECTURE}" STREQUAL "x86_64") | |
set(Qt5BIN "/usr/lib/x86_64-linux-gnu/qt5/bin") | |
set(Qt5LIBROOT "/usr/lib/x86_64-linux-gnu") | |
+elseif("${ARCHITECTURE}" STREQUAL "i686") | |
+set(Qt5BIN "/usr/lib/i386-linux-gnu/qt5/bin") | |
+set(Qt5LIBROOT "/usr/lib/i386-linux-gnu") | |
+endif() | |
+ | |
endif() | |
include_directories( | |
diff --git a/ros/src/util/packages/RobotSDK/glviewer/CMakeLists.txt b/ros/src/util/packages/RobotSDK/glviewer/CMakeLists.txt | |
index 0c27fdc..f220314 100644 | |
--- a/ros/src/util/packages/RobotSDK/glviewer/CMakeLists.txt | |
+++ b/ros/src/util/packages/RobotSDK/glviewer/CMakeLists.txt | |
@@ -34,11 +34,17 @@ set(Qt5LIBROOT "/usr/local/qtbase5/lib") | |
else() | |
# Ubuntu Qt5 package | |
set(Qt5INCLUDE "/usr/include/qt5") | |
+if("${ARCHITECTURE}" STREQUAL "x86_64") | |
set(Qt5BIN "/usr/lib/x86_64-linux-gnu/qt5/bin") | |
set(Qt5LIBROOT "/usr/lib/x86_64-linux-gnu") | |
+elseif("${ARCHITECTURE}" STREQUAL "i686") | |
+set(Qt5BIN "/usr/lib/i386-linux-gnu/qt5/bin") | |
+set(Qt5LIBROOT "/usr/lib/i386-linux-gnu") | |
endif() | |
-if("${ARCHITECTURE}" STREQUAL "x86_64") | |
+endif() | |
+ | |
+if("${ARCHITECTURE}" STREQUAL "x86_64" OR "${ARCHITECTURE}" STREQUAL "i686") | |
include_directories( | |
${catkin_INCLUDE_DIRS} | |
include/glviewer | |
diff --git a/ros/src/util/packages/RobotSDK/rosinterface/CMakeLists.txt b/ros/src/util/packages/RobotSDK/rosinterface/CMakeLists.txt | |
index af3f4a2..c05af4d 100644 | |
--- a/ros/src/util/packages/RobotSDK/rosinterface/CMakeLists.txt | |
+++ b/ros/src/util/packages/RobotSDK/rosinterface/CMakeLists.txt | |
@@ -41,6 +41,9 @@ set(Qt5INCLUDE "/usr/include/qt5") | |
if("${ARCHITECTURE}" STREQUAL "x86_64") | |
set(Qt5LIBROOT "/usr/lib/x86_64-linux-gnu") | |
set(Qt5BIN "/usr/lib/x86_64-linux-gnu/qt5/bin") | |
+elseif("${ARCHITECTURE}" STREQUAL "i686") | |
+ set(Qt5LIBROOT "/usr/lib/i386-linux-gnu") | |
+ set(Qt5BIN "/usr/lib/i386-linux-gnu/qt5/bin") | |
elseif("${ARCHITECTURE}" MATCHES "^arm") | |
set(Qt5LIBROOT "/usr/lib/arm-linux-gnueabihf") | |
set(Qt5BIN "/usr/lib/arm-linux-gnueabihf/qt5/bin") |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment