Commit d4ac2c3a authored by oscar's avatar oscar

修改直接编译代码,不适用库的方式

parent 544503c2
...@@ -60,7 +60,7 @@ configure_file ( ...@@ -60,7 +60,7 @@ configure_file (
file(GLOB_RECURSE GEOGRAPHICLIB_SRC file(GLOB_RECURSE GEOGRAPHICLIB_SRC
${JFX_COMMON_LIBS_PATH}/GeographicLib/src/*.cpp ${JFX_COMMON_LIBS_PATH}/GeographicLib/src/*.cpp
) )
add_library (CoordinateLib SHARED ${GEOGRAPHICLIB_SRC}) #add_library (CoordinateLib SHARED ${GEOGRAPHICLIB_SRC})
include_directories(${JFX_COMMON_LIBS_PATH}/GeographicLib/include) include_directories(${JFX_COMMON_LIBS_PATH}/GeographicLib/include)
include_directories(${JFX_COMMON_LIBS_PATH}/coordinate) include_directories(${JFX_COMMON_LIBS_PATH}/coordinate)
...@@ -171,6 +171,7 @@ file(GLOB_RECURSE TRACKER_SRC_FILES ...@@ -171,6 +171,7 @@ file(GLOB_RECURSE TRACKER_SRC_FILES
${PROJECT_SOURCE_DIR}/src/tracker/kalman_filter.cpp ${PROJECT_SOURCE_DIR}/src/tracker/kalman_filter.cpp
${PROJECT_SOURCE_DIR}/src/tracker/munkres.cpp ${PROJECT_SOURCE_DIR}/src/tracker/munkres.cpp
${JFX_COMMON_LIBS_PATH}/coordinate/*.cpp ${JFX_COMMON_LIBS_PATH}/coordinate/*.cpp
${GEOGRAPHICLIB_SRC}
) )
else() else()
file(GLOB_RECURSE TRACKER_SRC_FILES file(GLOB_RECURSE TRACKER_SRC_FILES
...@@ -203,10 +204,6 @@ target_link_libraries(${PROJECT_NAME}_node ...@@ -203,10 +204,6 @@ target_link_libraries(${PROJECT_NAME}_node
${OpenCV_LIBS} ${OpenCV_LIBS}
yaml-cpp yaml-cpp
) )
if(USING_UTM_POS)
target_link_libraries(${PROJECT_NAME}_node CoordinateLib)
endif()
if(KF_CUDA) if(KF_CUDA)
target_link_libraries(${PROJECT_NAME}_node kf_cuda) target_link_libraries(${PROJECT_NAME}_node kf_cuda)
......
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