changshu event cmake modify

24cab322 · alexander · a9aae5ec · 24cab322 · 47f3f7cf
Commit 24cab322 authored May 01, 2023 by alexander
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

CMakeLists.txt CMakeLists.txt +4 -3

jfxmap jfxmap +1 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,6 +138,7 @@ if (${platform_ret} MATCHES "x86_64")
    SET(GEOLIB ${CMAKE_CURRENT_SOURCE_DIR}/jfxmap/offline/Geographic/lib/x86/libGeographicLib.a)
 else ()
    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 ()

 ###################地图数据序列化存储#######################
@@ -177,7 +178,8 @@ file(GLOB SRC_LIST
 endif()

 #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_)


@@ -254,4 +256,4 @@ install(TARGETS
    LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
    RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
-endif()
\ No newline at end of file
+endif()
--- a/jfxmap @ 47f3f7cf
+++ b/jfxmap @ 47f3f7cf
-Subproject commit 1f0a7fd83fed81e790662340c44c33fdb68cf9ce
+Subproject commit 47f3f7cf8aa51612c3533a6f3f33095033ff33d8