You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by lo...@apache.org on 2024/06/25 12:46:16 UTC

(nifi-minifi-cpp) 02/02: MINIFICPP-2343 Fix quoting when CMake calls generateVersion.bat

This is an automated email from the ASF dual-hosted git repository.

lordgamez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git

commit 5b750fbcad17278f0182560ee107bbc39c9ca7f6
Author: Ferenc Gerlits <fg...@gmail.com>
AuthorDate: Fri Jun 14 13:58:17 2024 +0200

    MINIFICPP-2343 Fix quoting when CMake calls generateVersion.bat
    
    Signed-off-by: Gabor Gyimesi <ga...@gmail.com>
    
    This closes #1817
---
 CMakeLists.txt | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04e967bde..aaff3585e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -392,18 +392,28 @@ if (WIN32)
         COMMAND git log -1 --format=%h
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         OUTPUT_VARIABLE BUILD_REV
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-    execute_process(COMMAND
-        "${CMAKE_CURRENT_SOURCE_DIR}/generateVersion.bat"
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        COMMAND_ECHO STDOUT
+        ECHO_OUTPUT_VARIABLE)
+
+    execute_process(COMMAND powershell
+        "(New-Object -ComObject Scripting.FileSystemObject).GetFolder('${CMAKE_CURRENT_SOURCE_DIR}').ShortPath"
+        OUTPUT_VARIABLE CMAKE_CURRENT_SOURCE_DIR_SHORT_PATH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        COMMAND_ECHO STDOUT
+        ECHO_OUTPUT_VARIABLE)
+
+    execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR_SHORT_PATH}/generateVersion.bat
         "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_BINARY_DIR}/libminifi
+        "${CMAKE_CURRENT_SOURCE_DIR}"
+        "${CMAKE_CURRENT_BINARY_DIR}/libminifi"
         "${CMAKE_CXX_COMPILER}"
         "${CMAKE_CXX_COMPILER_VERSION}"
         "${CMAKE_CXX_FLAGS};${MINIFI_CPP_COMPILE_OPTIONS};${MINIFI_CPP_COMPILE_DEFINITIONS}"
         \"${selected_extensions}\"
         "${BUILD_IDENTIFIER}"
-        "${BUILD_REV}")
+        "${BUILD_REV}"
+        COMMAND_ECHO STDOUT)
 else()
     execute_process(COMMAND
         "${CMAKE_CURRENT_SOURCE_DIR}/generateVersion.sh"