This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via b7dea4e038f645ebb5269d35a10cadf3ce9e8bb7 (commit) via fd73bb601a629ce09868d3d7068272b3bd3870c3 (commit) via f56a0ddd289827b5daca473b6a3e46efa5c8f15b (commit) via 3d13492eac641f755ad13291560b91113c2a61d9 (commit) from f90469f107a8b7182e65bd4f9fbe315fc149f149 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7dea4e038f645ebb5269d35a10cadf3ce9e8bb7 commit b7dea4e038f645ebb5269d35a10cadf3ce9e8bb7 Merge: f90469f fd73bb6 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Apr 20 13:23:56 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Apr 20 13:23:56 2016 -0400 Merge topic 'fix-bison-flex-command-escaping' into next fd73bb60 Help: Add notes for topic 'fix-bison-flex-command-escaping' f56a0ddd FindBISON: Fix BISON_TARGET macro for special characters in path (#16072) 3d13492e FindFLEX: Fix FLEX_TARGET macro for special characters in path (#16072) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd73bb601a629ce09868d3d7068272b3bd3870c3 commit fd73bb601a629ce09868d3d7068272b3bd3870c3 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Apr 20 13:21:48 2016 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Wed Apr 20 13:22:47 2016 -0400 Help: Add notes for topic 'fix-bison-flex-command-escaping' diff --git a/Help/release/dev/fix-bison-flex-command-escaping.rst b/Help/release/dev/fix-bison-flex-command-escaping.rst new file mode 100644 index 0000000..dc2e87b --- /dev/null +++ b/Help/release/dev/fix-bison-flex-command-escaping.rst @@ -0,0 +1,12 @@ +fix-bison-flex-command-escaping +------------------------------- + +* The :module:`FindBISON` module ``BISON_TARGET`` macro now supports + special characters by passing the ``VERBATIM`` option to internal + :command:`add_custom_command` calls. This may break clients that + added escaping manually to work around the bug. + +* The :module:`FindFLEX` module ``FLEX_TARGET`` macro now supports + special characters by passing the ``VERBATIM`` option to internal + :command:`add_custom_command` calls. This may break clients that + added escaping manually to work around the bug. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f56a0ddd289827b5daca473b6a3e46efa5c8f15b commit f56a0ddd289827b5daca473b6a3e46efa5c8f15b Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Apr 20 13:19:31 2016 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Wed Apr 20 13:19:31 2016 -0400 FindBISON: Fix BISON_TARGET macro for special characters in path (#16072) Use the VERBATIM option to add_custom_command so that the command is escaped correctly. diff --git a/Modules/FindBISON.cmake b/Modules/FindBISON.cmake index 7d81276..69293f5 100644 --- a/Modules/FindBISON.cmake +++ b/Modules/FindBISON.cmake @@ -125,10 +125,10 @@ if(BISON_EXECUTABLE) get_filename_component(BISON_TARGET_output_path "${BisonOutput}" PATH) get_filename_component(BISON_TARGET_output_name "${BisonOutput}" NAME_WE) add_custom_command(OUTPUT ${filename} - COMMAND ${CMAKE_COMMAND} - ARGS -E copy + COMMAND ${CMAKE_COMMAND} -E copy "${BISON_TARGET_output_path}/${BISON_TARGET_output_name}.output" "${filename}" + VERBATIM DEPENDS "${BISON_TARGET_output_path}/${BISON_TARGET_output_name}.output" COMMENT "[BISON][${Name}] Copying bison verbose table to ${filename}" @@ -201,8 +201,8 @@ if(BISON_EXECUTABLE) add_custom_command(OUTPUT ${BISON_TARGET_outputs} ${BISON_TARGET_extraoutputs} - COMMAND ${BISON_EXECUTABLE} - ARGS ${BISON_TARGET_cmdopt} -o ${BisonOutput} ${BisonInput} + COMMAND ${BISON_EXECUTABLE} ${BISON_TARGET_cmdopt} -o ${BisonOutput} ${BisonInput} + VERBATIM DEPENDS ${BisonInput} COMMENT "[BISON][${Name}] Building parser with bison ${BISON_VERSION}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d13492eac641f755ad13291560b91113c2a61d9 commit 3d13492eac641f755ad13291560b91113c2a61d9 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Apr 20 13:18:56 2016 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Wed Apr 20 13:18:56 2016 -0400 FindFLEX: Fix FLEX_TARGET macro for special characters in path (#16072) Use the VERBATIM option to add_custom_command so that the command is escaped correctly. diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake index ca66493..b50c74a 100644 --- a/Modules/FindFLEX.cmake +++ b/Modules/FindFLEX.cmake @@ -185,8 +185,8 @@ if(FLEX_EXECUTABLE) endif() add_custom_command(OUTPUT ${FLEX_TARGET_outputs} - COMMAND ${FLEX_EXECUTABLE} - ARGS ${FLEX_EXECUTABLE_opts} -o${Output} ${Input} + COMMAND ${FLEX_EXECUTABLE} ${FLEX_EXECUTABLE_opts} -o${Output} ${Input} + VERBATIM DEPENDS ${Input} COMMENT "[FLEX][${Name}] Building scanner with flex ${FLEX_VERSION}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) ----------------------------------------------------------------------- Summary of changes: Help/release/dev/fix-bison-flex-command-escaping.rst | 12 ++++++++++++ Modules/FindBISON.cmake | 8 ++++---- Modules/FindFLEX.cmake | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 Help/release/dev/fix-bison-flex-command-escaping.rst hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits