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

Fix missing quotes in CMake files

This commit is contained in:
nsubiron 2019-04-23 16:03:49 +02:00
parent 9e4925b838
commit 00cdad57c6
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LibCarla/cmake/client/CMakeLists.txt
View File

@ -193,12 +193,12 @@ if (LIBCARLA_BUILD_RELEASE)
install(TARGETS carla_client DESTINATION lib) install(TARGETS carla_client DESTINATION lib)
if (WIN32) # @todo Fix PythonAPI build on Windows. if (WIN32) # @todo Fix PythonAPI build on Windows.
set_target_properties(carla_client PROPERTIES COMPILE_FLAGS ${CMAKE_CXX_FLAGS_RELEASE}) set_target_properties(carla_client PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}")
else () else ()
if (NOT DEFINED CMAKE_CXX_FLAGS_RELEASE_CLIENT) if (NOT DEFINED CMAKE_CXX_FLAGS_RELEASE_CLIENT)
set(CMAKE_CXX_FLAGS_RELEASE_CLIENT ${CMAKE_CXX_FLAGS_RELEASE}) set(CMAKE_CXX_FLAGS_RELEASE_CLIENT ${CMAKE_CXX_FLAGS_RELEASE})
endif() endif()
set_target_properties(carla_client PROPERTIES COMPILE_FLAGS ${CMAKE_CXX_FLAGS_RELEASE_CLIENT}) set_target_properties(carla_client PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE_CLIENT}")
endif (WIN32) endif (WIN32)
endif() endif()
@ -213,7 +213,7 @@ if (LIBCARLA_BUILD_DEBUG)
install(TARGETS carla_client_debug DESTINATION lib) install(TARGETS carla_client_debug DESTINATION lib)
set_target_properties(carla_client_debug PROPERTIES COMPILE_FLAGS ${CMAKE_CXX_FLAGS_DEBUG}) set_target_properties(carla_client_debug PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG}")
target_compile_definitions(carla_client_debug PUBLIC -DBOOST_ASIO_ENABLE_BUFFER_DEBUGGING) target_compile_definitions(carla_client_debug PUBLIC -DBOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
endif() endif()

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

@ -136,7 +136,7 @@ if (LIBCARLA_BUILD_RELEASE)
install(TARGETS carla_server DESTINATION lib OPTIONAL) install(TARGETS carla_server DESTINATION lib OPTIONAL)
set_target_properties(carla_server PROPERTIES COMPILE_FLAGS ${CMAKE_CXX_FLAGS_RELEASE}) set_target_properties(carla_server PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}")
endif() endif()
@ -150,7 +150,7 @@ if (LIBCARLA_BUILD_DEBUG)
install(TARGETS carla_server_debug DESTINATION lib OPTIONAL) install(TARGETS carla_server_debug DESTINATION lib OPTIONAL)
set_target_properties(carla_server_debug PROPERTIES COMPILE_FLAGS ${CMAKE_CXX_FLAGS_DEBUG}) set_target_properties(carla_server_debug PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG}")
target_compile_definitions(carla_server_debug PUBLIC -DBOOST_ASIO_ENABLE_BUFFER_DEBUGGING) target_compile_definitions(carla_server_debug PUBLIC -DBOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
endif() endif()

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

@ -63,7 +63,7 @@ endforeach(target)
if (LIBCARLA_BUILD_DEBUG) if (LIBCARLA_BUILD_DEBUG)
# Specific options for debug. # Specific options for debug.
set_target_properties(libcarla_test_${carla_config}_debug PROPERTIES COMPILE_FLAGS ${CMAKE_CXX_FLAGS_DEBUG}) set_target_properties(libcarla_test_${carla_config}_debug PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_DEBUG}")
target_link_libraries(libcarla_test_${carla_config}_debug "carla_${carla_config}_debug") target_link_libraries(libcarla_test_${carla_config}_debug "carla_${carla_config}_debug")
target_compile_definitions(libcarla_test_${carla_config}_debug PUBLIC -DBOOST_ASIO_ENABLE_BUFFER_DEBUGGING) target_compile_definitions(libcarla_test_${carla_config}_debug PUBLIC -DBOOST_ASIO_ENABLE_BUFFER_DEBUGGING)
if (CMAKE_BUILD_TYPE STREQUAL "Client") if (CMAKE_BUILD_TYPE STREQUAL "Client")
@ -73,7 +73,7 @@ endif()
if (LIBCARLA_BUILD_RELEASE) if (LIBCARLA_BUILD_RELEASE)
# Specific options for release. # Specific options for release.
set_target_properties(libcarla_test_${carla_config}_release PROPERTIES COMPILE_FLAGS ${CMAKE_CXX_FLAGS_RELEASE}) set_target_properties(libcarla_test_${carla_config}_release PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS_RELEASE}")
target_link_libraries(libcarla_test_${carla_config}_release "carla_${carla_config}") target_link_libraries(libcarla_test_${carla_config}_release "carla_${carla_config}")
if (CMAKE_BUILD_TYPE STREQUAL "Client") if (CMAKE_BUILD_TYPE STREQUAL "Client")
target_link_libraries(libcarla_test_${carla_config}_release "${BOOST_LIB_PATH}/libboost_filesystem.a") target_link_libraries(libcarla_test_${carla_config}_release "${BOOST_LIB_PATH}/libboost_filesystem.a")