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  0d7086e3daa67d6679f5ab01d9b187c333cca627 (commit)
       via  b551beb6facee72d1c1af455a9e4e8ecc7be959f (commit)
      from  6afc841e74cf15bab2bf30966a4ea277d9fff33f (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=0d7086e3daa67d6679f5ab01d9b187c333cca627
commit 0d7086e3daa67d6679f5ab01d9b187c333cca627
Merge: 6afc841 b551beb
Author:     Craig Scott <craig.sc...@crascit.com>
AuthorDate: Fri Nov 10 05:24:05 2017 +0000
Commit:     Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Nov 10 00:24:50 2017 -0500

    Merge topic 'fetchcontent-support-use-before-project-command'
    
    b551beb6 FetchContent: Support use of the module before "project()" command
    
    Acked-by: Kitware Robot <kwro...@kitware.com>
    Merge-request: !1448


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b551beb6facee72d1c1af455a9e4e8ecc7be959f
commit b551beb6facee72d1c1af455a9e4e8ecc7be959f
Author:     Jean-Christophe Fillion-Robin <jchris.filli...@kitware.com>
AuthorDate: Tue Nov 7 09:50:02 2017 -0500
Commit:     Jean-Christophe Fillion-Robin <jchris.filli...@kitware.com>
CommitDate: Tue Nov 7 09:50:02 2017 -0500

    FetchContent: Support use of the module before "project()" command
    
    Co-authored-by: Craig Scott <craig.sc...@crascit.com>
    Co-authored-by: Brad King <brad.k...@kitware.com>

diff --git a/Modules/FetchContent.cmake b/Modules/FetchContent.cmake
index 132354f..98cdf6c 100644
--- a/Modules/FetchContent.cmake
+++ b/Modules/FetchContent.cmake
@@ -754,7 +754,9 @@ function(__FetchContent_directPopulate contentName)
       list(APPEND generatorOpts "-T${CMAKE_GENERATOR_TOOLSET}")
     endif()
 
-    list(APPEND generatorOpts 
"-DCMAKE_MAKE_PROGRAM:FILE=${CMAKE_MAKE_PROGRAM}")
+    if(CMAKE_MAKE_PROGRAM)
+      list(APPEND generatorOpts 
"-DCMAKE_MAKE_PROGRAM:FILEPATH=${CMAKE_MAKE_PROGRAM}")
+    endif()
 
   else()
     # Likely we've been invoked via CMake's script mode where no

-----------------------------------------------------------------------

Summary of changes:
 Modules/FetchContent.cmake |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

Reply via email to