1

.gitmodules

 [submodule "jfxmap"]
 	path = jfxmap
 	url = http://git.corp.roadlinks.cn:2020/jfxsim/jfxmap.git
+	branch = rav4_api

CMakeLists.txt

@@ -9,17 +9,17 @@ SET(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -Wall -g -ggdb")
 SET(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O3 -Wall")
 
 include_directories(
-    ${PROJECT_SOURCE_DIR}/
-    ${PROJECT_SOURCE_DIR}/include/
-    ${PROJECT_SOURCE_DIR}/src/
-    ${PROJECT_SOURCE_DIR}/../ego_motion/include
-    ${PROJECT_SOURCE_DIR}/jfxmap/offline/Core
-    ${PROJECT_SOURCE_DIR}/jfxmap/offline/Match
-    ${PROJECT_SOURCE_DIR}/jfxmap/offline/Route
-    ${PROJECT_SOURCE_DIR}/jfxmap/offline/Utils
-    ${PROJECT_SOURCE_DIR}/jfxmap/offline/xxtea-c
-    ${PROJECT_SOURCE_DIR}/jfxmap/submodules/ajson
-    ${PROJECT_SOURCE_DIR}/jfxmap/submodules/xxtea-c
+    ${CMAKE_CURRENT_SOURCE_DIR}/
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/map_location/jfxmap/offline/Match
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/
+    ${CMAKE_CURRENT_SOURCE_DIR}/jfxmap/offline/Core
+    ${CMAKE_CURRENT_SOURCE_DIR}/jfxmap/offline/Match
+    ${CMAKE_CURRENT_SOURCE_DIR}/jfxmap/offline/Route
+    ${CMAKE_CURRENT_SOURCE_DIR}/jfxmap/offline/Utils
+    ${CMAKE_CURRENT_SOURCE_DIR}/jfxmap/offline/xxtea-c
+    ${CMAKE_CURRENT_SOURCE_DIR}/jfxmap/submodules/ajson
+    ${CMAKE_CURRENT_SOURCE_DIR}/jfxmap/submodules/xxtea-c
 )
 
 file(GLOB MAP_SRC_LIST
@@ -27,15 +27,12 @@ file(GLOB MAP_SRC_LIST
         "jfxmap/offline/Core/*.cpp"
         "jfxmap/offline/Route/*.cpp"
         "jfxmap/offline/Utils/*.cpp"
-        #"jfxmap/offline/Projects/rav4/**/*.cpp"
-        #"jfxmap/offline/Projects/rav4/**/*.c"
         "jfxmap/submodules/xxtea-c/*.c"
-        #"jfxmap/offline/Projects/rav4/Main.cpp"
         )
 
 add_library(${PROJECT_NAME} SHARED
-        ${PROJECT_SOURCE_DIR}/src/MapLocationBase.cpp
-        ${PROJECT_SOURCE_DIR}/src/MapLocation.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/MapLocationBase.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/MapLocation.cpp
         ${MAP_SRC_LIST}
         )