Link to rpclib in various projects

* Link directly to the rpclib created by the rpclib submodule
Mayankm96 · Feb 26, 2017 · 6fb0fc3 · 6fb0fc3
1 parent 749444f
commit 6fb0fc3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/cmake/AirLib/CMakeLists.txt b/cmake/AirLib/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(
   ${AIRSIM_ROOT}/AirLib/
   ${AIRSIM_ROOT}/AirLib/include
   ${AIRSIM_ROOT}/MavLinkCom/include
-  ${AIRSIM_ROOT}/AirLib//deps/rpclib/include
+  ${AIRSIM_ROOT}/external/rpclib/include
 )
 
 add_library(AirLib STATIC
@@ -34,6 +34,7 @@ add_library(AirLib STATIC
 			)
 
 ## Add these to your app that links this library:			
+target_link_libraries(${PROJECT_NAME} ${CMAKE_PROJECT_NAME}-${RPCLIB_NAME_SUFFIX})
 
 #string(SUBSTRING ${CMAKE_STATIC_LINKER_FLAGS} 9 -1 "BUILD_PLATFORM")
 #find_package(Threads REQUIRED)

diff --git a/cmake/DroneServer/CMakeLists.txt b/cmake/DroneServer/CMakeLists.txt
@@ -43,7 +43,7 @@ find_package(Threads REQUIRED)
 target_link_libraries(${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT})
 target_link_libraries(${PROJECT_NAME} AirLib)
 target_link_libraries(${PROJECT_NAME} MavLinkCom)
-target_link_libraries(${PROJECT_NAME} ${RPC_LIB})
+target_link_libraries(${PROJECT_NAME} ${CMAKE_PROJECT_NAME}-${RPCLIB_NAME_SUFFIX})
 IF(UNIX)
 target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES})
 ENDIF()
diff --git a/cmake/DroneShell/CMakeLists.txt b/cmake/DroneShell/CMakeLists.txt
@@ -45,7 +45,7 @@ find_package(Threads REQUIRED)
 target_link_libraries(${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT})
 target_link_libraries(${PROJECT_NAME} AirLib)
 target_link_libraries(${PROJECT_NAME} MavLinkCom)
-target_link_libraries(${PROJECT_NAME} ${RPC_LIB})
+target_link_libraries(${PROJECT_NAME} ${CMAKE_PROJECT_NAME}-${RPCLIB_NAME_SUFFIX})
 IF(UNIX)
 target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES})
 ENDIF()
diff --git a/cmake/HelloDrone/CMakeLists.txt b/cmake/HelloDrone/CMakeLists.txt
@@ -42,7 +42,7 @@ find_package(Threads REQUIRED)
 target_link_libraries(${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT})
 target_link_libraries(${PROJECT_NAME} MavLinkCom)
 target_link_libraries(${PROJECT_NAME} AirLib)
-target_link_libraries(${PROJECT_NAME} ${RPC_LIB})
+target_link_libraries(${PROJECT_NAME} ${CMAKE_PROJECT_NAME}-${RPCLIB_NAME_SUFFIX})
 IF(UNIX)
 target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES})
 ENDIF()