From ac29e870e8812ff2ba8fe53058adf046dec2a48f Mon Sep 17 00:00:00 2001 From: Akihito OHSATO Date: Sat, 16 Mar 2019 09:21:23 +0900 Subject: [PATCH] Unsupport indigo version --- ros/src/actuation/vehicles/packages/ymc/CMakeLists.txt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/ros/src/actuation/vehicles/packages/ymc/CMakeLists.txt b/ros/src/actuation/vehicles/packages/ymc/CMakeLists.txt index aa722bc17f6..f5f43bdd559 100755 --- a/ros/src/actuation/vehicles/packages/ymc/CMakeLists.txt +++ b/ros/src/actuation/vehicles/packages/ymc/CMakeLists.txt @@ -35,12 +35,6 @@ include_directories( include ) -IF (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.1) - set(LIB_VERSION 2.0) # _GLIBCXX_USE_CXX11_ABI is 1 -ELSE () - set(LIB_VERSION 1.0) # _GLIBCXX_USE_CXX11_ABI is 0 -ENDIF () - add_executable(g30esli_interface node/g30esli_interface/g30esli_interface.cpp ) @@ -51,7 +45,7 @@ add_dependencies(g30esli_interface target_link_libraries(g30esli_interface ${catkin_LIBRARIES} - ${CMAKE_CURRENT_SOURCE_DIR}/lib/libymc_can_${LIB_VERSION}${LIB_ARCH}.a + ${CMAKE_CURRENT_SOURCE_DIR}/lib/libymc_can${LIB_ARCH}.a ) install(TARGETS g30esli_interface @@ -61,4 +55,4 @@ install(TARGETS g30esli_interface install(DIRECTORY launch/ DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch - PATTERN ".svn" EXCLUDE) \ No newline at end of file + PATTERN ".svn" EXCLUDE)