[Cmake-commits] CMake branch, master, updated. v3.15.0-rc1-13-gbaf3a84
Kitware Robot
kwrobot at kitware.com
Thu Jun 6 10:33:07 EDT 2019
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, master has been updated
via baf3a84eff415be8691724153a10031401321d0f (commit)
via 8a4732c60e5cb2137fa824605e4668f3229a9684 (commit)
from 9ef92b7d7d577350cc67c7762112b6056adef34d (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=baf3a84eff415be8691724153a10031401321d0f
commit baf3a84eff415be8691724153a10031401321d0f
Merge: 9ef92b7 8a4732c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 6 14:32:02 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jun 6 10:32:10 2019 -0400
Merge topic 'cpack-nuget-case'
8a4732c60e CPack/NuGet: Find nuget tool on case sensitive file system
Acked-by: Kitware Robot <kwrobot at kitware.com>
Acked-by: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Merge-request: !3427
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a4732c60e5cb2137fa824605e4668f3229a9684
commit 8a4732c60e5cb2137fa824605e4668f3229a9684
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
AuthorDate: Wed Jun 5 10:17:21 2019 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 5 09:32:22 2019 -0400
CPack/NuGet: Find nuget tool on case sensitive file system
There is no need to use a CamelCase executable name since it will be
handled gracefully on Windows anyway. This change allow support for
Linux system, in particular Debian distribution where the binary is
called `nuget`.
diff --git a/Modules/Internal/CPack/CPackNuGet.cmake b/Modules/Internal/CPack/CPackNuGet.cmake
index 198ccad..4b2ce92 100644
--- a/Modules/Internal/CPack/CPackNuGet.cmake
+++ b/Modules/Internal/CPack/CPackNuGet.cmake
@@ -276,7 +276,7 @@ function(_cpack_nuget_make_files_tag)
set(_CPACK_NUGET_FILES_TAG "<files>\n${_files} </files>" PARENT_SCOPE)
endfunction()
-find_program(NUGET_EXECUTABLE NuGet)
+find_program(NUGET_EXECUTABLE nuget)
_cpack_nuget_debug_var(NUGET_EXECUTABLE)
if(NOT NUGET_EXECUTABLE)
message(FATAL_ERROR "NuGet executable not found")
-----------------------------------------------------------------------
Summary of changes:
Modules/Internal/CPack/CPackNuGet.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list