cpp/openttd-patchpack/source Changeset - r25624:c1d8d2ba6a32

Changeset - r25624:c1d8d2ba6a32

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Loïc Guilloux - 3 years ago 2021-06-10 20:14:08
glx22@users.noreply.github.com

Fix #9329: [CMake] FindVersion.cmake relied on internal cmake variable (#9330)

2 files changed with 2 insertions and 1 deletions:

CMakeLists.txt

cmake/scripts/FindVersion.cmake

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -74,12 +74,13 @@ add_custom_target(find_version @@
         ${CMAKE_COMMAND}
                 -DFIND_VERSION_BINARY_DIR=${CMAKE_BINARY_DIR}/generated
                 -DCPACK_BINARY_DIR=${CMAKE_BINARY_DIR}
                 -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}
+)
 # Documentation

cmake/scripts/FindVersion.cmake

➞

Show inline comments

@@ @@ -135,13 +135,13 @@ if(GENERATE_OTTDREV) @@
     file(WRITE ${CMAKE_SOURCE_DIR}/.ottdrev "${REV_VERSION}\t${REV_ISODATE}\t${REV_MODIFIED}\t${REV_HASH}\t${REV_ISTAG}\t${REV_ISSTABLETAG}\t${REV_YEAR}\n")
 else()
     message(STATUS "Generating rev.cpp")
     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")
     endif()
     message(STATUS "Generating CPackProperties.cmake")

0 comments (0 inline, 0 general)