diff options
| author | Loïc Guilloux <glx22@users.noreply.github.com> | 2021-06-10 22:14:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-10 22:14:08 +0200 |
| commit | 076f3d26c238a9443b367629ab97dc1a5cf9b931 (patch) | |
| tree | c7e409bf09d846b35db371bddd967ccefb2d6c70 | |
| parent | 2924ac48c5013acf18b7577de4f610612d88dd6c (diff) | |
| download | openttd-076f3d26c238a9443b367629ab97dc1a5cf9b931.tar.xz | |
Fix #9329: [CMake] FindVersion.cmake relied on internal cmake variable (#9330)
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cmake/scripts/FindVersion.cmake | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d060ffbbf..6cc2f7e2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,6 +77,7 @@ add_custom_target(find_version -DREV_MAJOR=${PROJECT_VERSION_MAJOR} -DREV_MINOR=${PROJECT_VERSION_MINOR} -DREV_BUILD=${PROJECT_VERSION_PATCH} + -DWINDOWS=${WIN32} -P "${CMAKE_SOURCE_DIR}/cmake/scripts/FindVersion.cmake" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} BYPRODUCTS ${GENERATED_SOURCE_FILES} diff --git a/cmake/scripts/FindVersion.cmake b/cmake/scripts/FindVersion.cmake index 6e4a2b390..43255e801 100644 --- a/cmake/scripts/FindVersion.cmake +++ b/cmake/scripts/FindVersion.cmake @@ -138,7 +138,7 @@ else() configure_file("${CMAKE_SOURCE_DIR}/src/rev.cpp.in" "${FIND_VERSION_BINARY_DIR}/rev.cpp") - if(WIN32) + if(WINDOWS) message(STATUS "Generating ottdres.rc") configure_file("${CMAKE_SOURCE_DIR}/src/os/windows/ottdres.rc.in" "${FIND_VERSION_BINARY_DIR}/ottdres.rc") |