Skip to content

Commit

Permalink
Merge pull request #3 from 708yamaguchi/fix-architecture
Browse files Browse the repository at this point in the history
[aques_talk] Fix architecture type for docker
  • Loading branch information
k-okada committed Nov 25, 2020
2 parents ef52b79 + 7cdd257 commit 4427863
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion 3rdparty/aques_talk/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ find_package(catkin REQUIRED)

catkin_package()

if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64* )
# Considering the use of docker in addition to the usual use,
# we use dpkg-architecture command instead of ${CMAKE_SYSTEM_PROCESSOR} to get the architecture.
# https://stackoverflow.com/a/58222507
# http://manpages.ubuntu.com/manpages/bionic/man1/dpkg-architecture.1.html
execute_process(COMMAND dpkg-architecture -qDEB_HOST_GNU_CPU OUTPUT_VARIABLE ARCHITECTURE)
if("${ARCHITECTURE}" MATCHES x86_64* )
set(AQTK2_LNX_LIB_DIR "lib64")
else ()
set(AQTK2_LNX_LIB_DIR "lib")
Expand Down

0 comments on commit 4427863

Please sign in to comment.