[Cmake-commits] CMake branch, master, updated. v3.14.1-680-g5ae1506

Kitware Robot kwrobot at kitware.com
Thu Apr 11 10:13:06 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  5ae15061c36f45551d0308a5ff916067970705ff (commit)
       via  39e7fd8c68a1f039f089756352a418bd0ae36aea (commit)
       via  baed22c4b000d524f4890af86cf3c02dc885cba6 (commit)
       via  44d6370db35c82d182bfc9480f0f0031b6b559ed (commit)
       via  538721939faef01b00ffd20416e8f7146d7368ac (commit)
      from  be101e909e42c4a22c180d29ee217d5b8c4508d1 (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=5ae15061c36f45551d0308a5ff916067970705ff
commit 5ae15061c36f45551d0308a5ff916067970705ff
Merge: be101e9 39e7fd8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 11 14:12:08 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Apr 11 10:12:32 2019 -0400

    Merge topic 'test-explicit-dirs'
    
    39e7fd8c68 Tests: Avoid enabling languages in RunCMake.CommandLine -S and -B cases
    baed22c4b0 Tests: Fix RunCMake.CommandLine test to use generator with -S and -B
    44d6370db3 Tests: Add RunCMake helper to run cmake with options
    538721939f Tests: Teach RunCMake to optionally exclude the source dir argument
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3209


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39e7fd8c68a1f039f089756352a418bd0ae36aea
commit 39e7fd8c68a1f039f089756352a418bd0ae36aea
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 10 09:33:02 2019 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 10 09:40:48 2019 -0400

    Tests: Avoid enabling languages in RunCMake.CommandLine -S and -B cases
    
    The test project does not compile any sources and so does not
    need to enable any languages.

diff --git a/Tests/RunCMake/CommandLine/ExplicitDirs/CMakeLists.txt b/Tests/RunCMake/CommandLine/ExplicitDirs/CMakeLists.txt
index 0ca5a0a..fc62914 100644
--- a/Tests/RunCMake/CommandLine/ExplicitDirs/CMakeLists.txt
+++ b/Tests/RunCMake/CommandLine/ExplicitDirs/CMakeLists.txt
@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.14)
+project(ExplicitDirs NONE)
 add_custom_command(
   OUTPUT output.txt
   COMMAND ${CMAKE_COMMAND} -E echo CustomCommand > output.txt

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=baed22c4b000d524f4890af86cf3c02dc885cba6
commit baed22c4b000d524f4890af86cf3c02dc885cba6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 10 09:31:38 2019 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 10 09:40:48 2019 -0400

    Tests: Fix RunCMake.CommandLine test to use generator with -S and -B
    
    The `-S` and `-B` command-line option tests do generate build systems
    and so should use the generator being tested.

diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
index 3deabd0..ea749ea 100644
--- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake
@@ -82,23 +82,27 @@ project(ExplicitDirsMissing LANGUAGES NONE)
   set(source_dir ${RunCMake_SOURCE_DIR}/ExplicitDirs)
   set(binary_dir ${RunCMake_BINARY_DIR}/ExplicitDirs-build)
 
+  set(RunCMake_TEST_SOURCE_DIR "${source_dir}")
+  set(RunCMake_TEST_BINARY_DIR "${binary_dir}")
+  set(RunCMake_TEST_NO_CLEAN 1)
+  set(RunCMake_TEST_NO_SOURCE_DIR 1)
+
   file(REMOVE_RECURSE "${binary_dir}")
-  file(MAKE_DIRECTORY "${binary_dir}")
-  run_cmake_command(S-arg ${CMAKE_COMMAND} -S ${source_dir} ${binary_dir})
-  run_cmake_command(S-arg-reverse-order ${CMAKE_COMMAND} ${binary_dir} -S${source_dir} )
-  run_cmake_command(S-no-arg ${CMAKE_COMMAND} -S )
-  run_cmake_command(S-no-arg2 ${CMAKE_COMMAND} -S -T)
-  run_cmake_command(S-B ${CMAKE_COMMAND} -S ${source_dir} -B ${binary_dir})
+  run_cmake_with_options(S-arg -S ${source_dir} ${binary_dir})
+  run_cmake_with_options(S-arg-reverse-order ${binary_dir} -S${source_dir} )
+  run_cmake_with_options(S-no-arg -S )
+  run_cmake_with_options(S-no-arg2 -S -T)
+  run_cmake_with_options(S-B -S ${source_dir} -B ${binary_dir})
 
   # make sure that -B can explicitly construct build directories
   file(REMOVE_RECURSE "${binary_dir}")
-  run_cmake_command(B-arg ${CMAKE_COMMAND} -B ${binary_dir} ${source_dir})
+  run_cmake_with_options(B-arg -B ${binary_dir} ${source_dir})
   file(REMOVE_RECURSE "${binary_dir}")
-  run_cmake_command(B-arg-reverse-order ${CMAKE_COMMAND} ${source_dir} -B${binary_dir})
-  run_cmake_command(B-no-arg ${CMAKE_COMMAND} -B )
-  run_cmake_command(B-no-arg2 ${CMAKE_COMMAND} -B -T)
+  run_cmake_with_options(B-arg-reverse-order ${source_dir} -B${binary_dir})
+  run_cmake_with_options(B-no-arg -B )
+  run_cmake_with_options(B-no-arg2 -B -T)
   file(REMOVE_RECURSE "${binary_dir}")
-  run_cmake_command(B-S ${CMAKE_COMMAND} -B${binary_dir} -S${source_dir})
+  run_cmake_with_options(B-S -B${binary_dir} -S${source_dir})
 
 endfunction()
 run_ExplicitDirs()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44d6370db35c82d182bfc9480f0f0031b6b559ed
commit 44d6370db35c82d182bfc9480f0f0031b6b559ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 10 09:30:46 2019 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 10 09:40:48 2019 -0400

    Tests: Add RunCMake helper to run cmake with options

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 5d49909..ad3f8f6 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -188,5 +188,10 @@ function(run_cmake_command test)
   run_cmake(${test})
 endfunction()
 
+function(run_cmake_with_options test)
+  set(RunCMake_TEST_OPTIONS "${ARGN}")
+  run_cmake(${test})
+endfunction()
+
 # Protect RunCMake tests from calling environment.
 unset(ENV{MAKEFLAGS})

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=538721939faef01b00ffd20416e8f7146d7368ac
commit 538721939faef01b00ffd20416e8f7146d7368ac
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 10 09:29:30 2019 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 10 09:40:48 2019 -0400

    Tests: Teach RunCMake to optionally exclude the source dir argument

diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index ce71677..5d49909 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -98,8 +98,14 @@ function(run_cmake test)
     else()
       set(_D_CMAKE_GENERATOR_INSTANCE "")
     endif()
+    if(NOT RunCMake_TEST_NO_SOURCE_DIR)
+      set(maybe_source_dir "${RunCMake_TEST_SOURCE_DIR}")
+    else()
+      set(maybe_source_dir "")
+    endif()
     execute_process(
-      COMMAND ${CMAKE_COMMAND} "${RunCMake_TEST_SOURCE_DIR}"
+      COMMAND ${CMAKE_COMMAND}
+                ${maybe_source_dir}
                 -G "${RunCMake_GENERATOR}"
                 -A "${RunCMake_GENERATOR_PLATFORM}"
                 -T "${RunCMake_GENERATOR_TOOLSET}"

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

Summary of changes:
 .../CommandLine/ExplicitDirs/CMakeLists.txt        |  3 ++-
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake      | 26 +++++++++++++---------
 Tests/RunCMake/RunCMake.cmake                      | 13 ++++++++++-
 3 files changed, 29 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake

More information about the Cmake-commits mailing list