p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix cmake boost lib path for LibCarla server 

For the server the boost lib path was define as BOOST_LIBRARY_PATH and for the client as BOOT_LIB_PATH. To keep it uniform between linux and windows, the variable was rename as BOOST_LIB_PATH.
This commit is contained in:
iFuSiiOnzZ 2018-07-30 09:34:11 +02:00
parent 756646020d
commit 4a56c81ee9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LibCarla/cmake/server/CMakeLists.txt
View File

@ -35,10 +35,10 @@ install(FILES ${libcarla_carla_streaming_low_level_headers} DESTINATION include/
install(DIRECTORY "${BOOST_INCLUDE_PATH}/boost" DESTINATION include)
if(WIN32)
file(GLOB boostlib_date_time "${BOOST_LIBRARY_PATH}/libboost_date_time-*-mt-*.lib")
file(GLOB boostlib_date_time "${BOOST_LIB_PATH}/libboost_date_time-*-mt-*.lib")
install(FILES ${boostlib_date_time} DESTINATION lib)
file(GLOB boostlib_system "${BOOST_LIBRARY_PATH}/libboost_system-*-mt-*.lib")
file(GLOB boostlib_system "${BOOST_LIB_PATH}/libboost_system-*-mt-*.lib")
install(FILES ${boostlib_system} DESTINATION lib)
endif()

2
Util/BuildTools/Setup.bat
View File

@ -149,7 +149,7 @@ set CMAKE_INSTALLATION_DIR=%INSTALLATION_DIR:\=/%
>>"%INSTALLATION_DIR%CMakeLists.txt.in" echo add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY)
>>"%INSTALLATION_DIR%CMakeLists.txt.in" echo.
>>"%INSTALLATION_DIR%CMakeLists.txt.in" echo set(BOOST_INCLUDE_PATH "%CMAKE_INSTALLATION_DIR%boost-install/include")
>>"%INSTALLATION_DIR%CMakeLists.txt.in" echo set(BOOST_LIBRARY_PATH "%CMAKE_INSTALLATION_DIR%boost-install/lib")
>>"%INSTALLATION_DIR%CMakeLists.txt.in" echo set(BOOST_LIB_PATH "%CMAKE_INSTALLATION_DIR%boost-install/lib")
>>"%INSTALLATION_DIR%CMakeLists.txt.in" echo.
>>"%INSTALLATION_DIR%CMakeLists.txt.in" echo set(RPCLIB_INCLUDE_PATH "%CMAKE_INSTALLATION_DIR%rpclib-install/include")
>>"%INSTALLATION_DIR%CMakeLists.txt.in" echo set(RPCLIB_LIB_PATH "%CMAKE_INSTALLATION_DIR%rpclib-install/lib")