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

Fix LibCarla's Version.h.in (file configured by CMake to set the library version). (#7647) 

Co-authored-by: Marcel Pi <marcelpi97@gmail.com>
This commit is contained in:
MarcelPiNacy-CVC 2024-05-15 16:07:47 +02:00 committed by GitHub
parent e23f437dc2
commit bca3b5abef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMake/Util.cmake
View File

@ -1,12 +1,12 @@
# Similar to configure_file, but also expands variables # Similar to configure_file, but also expands variables
# that are set at generate time, like generator expressions. # 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}") carla_message ("Configuring file ${DESTINATION}")
# Configure-time step; evaluate variables: # Configure-time step; evaluate variables:
configure_file (${SOURCE} ${DESTINATION} @ONLY) configure_file (${SOURCE} ${DESTINATION} @ONLY)
# Generate-time step; evaluate generator expressions: # Generate-time step; evaluate generator expressions:
file (GENERATE OUTPUT ${DESTINATION} INPUT ${DESTINATION}) file (GENERATE OUTPUT ${DESTINATION} INPUT ${DESTINATION})
endmacro () endfunction ()

2
LibCarla/source/carla/Version.h.in
View File

@ -9,7 +9,7 @@
namespace carla { namespace carla {
constexpr const char *version() { constexpr const char *version() {
return "${CARLA_VERSION}"; return "@CARLA_VERSION@";
} }
} // namespace carla } // namespace carla