Skip to content

J
jfx_traffic_events
Commit 24cab322 authored by alexander's avatar alexander
Browse files
Options

changshu event cmake modify

parent a9aae5ec
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
CMakeLists.txt
View file @ 24cab322
...@@ -138,6 +138,7 @@ if (${platform_ret} MATCHES "x86_64") ...@@ -138,6 +138,7 @@ if (${platform_ret} MATCHES "x86_64")
SET(GEOLIB ${CMAKE_CURRENT_SOURCE_DIR}/jfxmap/offline/Geographic/lib/x86/libGeographicLib.a) SET(GEOLIB ${CMAKE_CURRENT_SOURCE_DIR}/jfxmap/offline/Geographic/lib/x86/libGeographicLib.a)
else () else ()
SET(LIBGLOG ${CMAKE_CURRENT_SOURCE_DIR}/jfxmap/offline/Log/lib/arm/libglog.a) SET(LIBGLOG ${CMAKE_CURRENT_SOURCE_DIR}/jfxmap/offline/Log/lib/arm/libglog.a)
SET(GEOLIB ${CMAKE_CURRENT_SOURCE_DIR}/jfxmap/offline/Geographic/lib/arm/libGeographicLib.a)
endif () endif ()
###################地图数据序列化存储####################### ###################地图数据序列化存储#######################
...@@ -177,7 +178,8 @@ file(GLOB SRC_LIST ...@@ -177,7 +178,8 @@ file(GLOB SRC_LIST
endif() endif()
#link_directories(${PROJECT_SOURCE_DIR}/thirdparty/jfxmap/lib) #link_directories(${PROJECT_SOURCE_DIR}/thirdparty/jfxmap/lib)
add_definitions(-D_ROS_QICHECHENG_NEW_) #add_definitions(-D_ROS_QICHECHENG_NEW_)
add_definitions(-D_ROS_XISHAN_)
add_definitions(-D_NEW_CHANGE_) add_definitions(-D_NEW_CHANGE_)
...@@ -254,4 +256,4 @@ install(TARGETS ...@@ -254,4 +256,4 @@ install(TARGETS
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
) )
endif() endif()
\ No newline at end of file
jfxmap @ 47f3f7cf
Subproject commit 1f0a7fd83fed81e790662340c44c33fdb68cf9ce Subproject commit 47f3f7cf8aa51612c3533a6f3f33095033ff33d8
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment