From bca3b5abef20383d8cf17891928f0c31f6113a0b Mon Sep 17 00:00:00 2001 From: MarcelPiNacy-CVC <169088301+MarcelPiNacy-CVC@users.noreply.github.com> Date: Wed, 15 May 2024 16:07:47 +0200 Subject: [PATCH] Fix LibCarla's Version.h.in (file configured by CMake to set the library version). (#7647) Co-authored-by: Marcel Pi --- CMake/Util.cmake | 4 ++-- LibCarla/source/carla/Version.h.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMake/Util.cmake b/CMake/Util.cmake index a30fc797a..5a2c0e629 100644 --- a/CMake/Util.cmake +++ b/CMake/Util.cmake @@ -1,12 +1,12 @@ # Similar to configure_file, but also expands variables # that are set at generate time, like generator expressions. -macro (carla_two_step_configure_file DESTINATION SOURCE) +function (carla_two_step_configure_file DESTINATION SOURCE) carla_message ("Configuring file ${DESTINATION}") # Configure-time step; evaluate variables: configure_file (${SOURCE} ${DESTINATION} @ONLY) # Generate-time step; evaluate generator expressions: file (GENERATE OUTPUT ${DESTINATION} INPUT ${DESTINATION}) -endmacro () +endfunction () diff --git a/LibCarla/source/carla/Version.h.in b/LibCarla/source/carla/Version.h.in index 68025c014..4e0cddd2c 100644 --- a/LibCarla/source/carla/Version.h.in +++ b/LibCarla/source/carla/Version.h.in @@ -9,7 +9,7 @@ namespace carla { constexpr const char *version() { - return "${CARLA_VERSION}"; + return "@CARLA_VERSION@"; } } // namespace carla