From 8717de7871a980a6028cf8ed21588b0de453cbea Mon Sep 17 00:00:00 2001 From: Blyron Date: Tue, 2 Jul 2024 16:05:10 +0200 Subject: [PATCH] Update cmakelists --- Examples/CMakeLists.txt | 91 +++++++++++++---------------------------- 1 file changed, 29 insertions(+), 62 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index e7cb7f5da..596a59d16 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -3,71 +3,38 @@ set ( ${CARLA_WORKSPACE_PATH}/Examples/CppClient ) -set ( - CARLA_EXAMPLE_CPP_DEPENDENCIES - carla-client - rpc - png_static - zlibstatic - Boost::asio - Boost::python - Boost::geometry - Boost::gil - RecastNavigation::Recast - RecastNavigation::Detour - RecastNavigation::DetourCrowd +carla_message ("CARLA Building C++ EXAMPLE CLIENT") + +project ( + carla-example-cpp-client + LANGUAGES + CXX + VERSION + ${CARLA_VERSION} ) -if (BUILD_EXAMPLES) - carla_message ("CARLA Building C++ EXAMPLE CLIENT") +file ( + GLOB_RECURSE + CARLA_EXAMPLE_CPP_SOURCES + CONFIGURE_DEPENDS + ${CARLA_EXAMPLE_CPP_CLIENT_SOURCE_PATH}/*.cpp +) - project ( - carla-example-cpp-client - LANGUAGES - CXX - VERSION - ${CARLA_VERSION} - ) +file ( + GLOB_RECURSE + CARLA_EXAMPLE_CPP_HEADERS + CONFIGURE_DEPENDS + ${CARLA_EXAMPLE_CPP_CLIENT_SOURCE_PATH}/*.h +) - file ( - GLOB_RECURSE - CARLA_EXAMPLE_CPP_SOURCES - CONFIGURE_DEPENDS - ${CARLA_EXAMPLE_CPP_CLIENT_SOURCE_PATH}/*.cpp - ) - - file ( - GLOB_RECURSE - CARLA_EXAMPLE_CPP_HEADERS - CONFIGURE_DEPENDS - ${CARLA_EXAMPLE_CPP_CLIENT_SOURCE_PATH}/*.h - ) +carla_add_executable ( + carla-example-client + "Build the CARLA C++ client example." + ${CARLA_EXAMPLE_CPP_SOURCES} +) - carla_add_executable ( - carla-example-client - "Build the CARLA C++ client example." - ${CARLA_EXAMPLE_CPP_SOURCES} - ) - - add_dependencies ( - carla-example-client - ${CARLA_EXAMPLE_CPP_DEPENDENCIES} - ) +target_link_libraries ( + carla-example-client PUBLIC + carla-client +) - target_link_libraries ( - carla-example-client PUBLIC - carla-client - Boost::asio - Boost::python - Boost::algorithm - Boost::geometry - Boost::assert - Boost::gil - RecastNavigation::Recast - RecastNavigation::Detour - RecastNavigation::DetourCrowd - png_static - zlibstatic - rpc - ) -endif ()