[Cmake-commits] CMake branch, next, updated. v3.5.0-631-gd501d79

[Brad King]

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  d501d79721099385a2452450a6c16b18cd259224 (commit)
       via  b06e17da7b4137d22ae7cfcf14c6aa3205577822 (commit)
       via  525402450a1ccde0e9187c9613752f728a96149b (commit)
      from  ad7297d39ef8b8ff960611a03e09c521265031fc (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=d501d79721099385a2452450a6c16b18cd259224
commit d501d79721099385a2452450a6c16b18cd259224
Merge: ad7297d b06e17d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 23 14:03:31 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 23 14:03:31 2016 -0400

    Merge topic 'cmake-depend-in-project-only' into next
    
    b06e17da Help: Add notes for topic 'cmake-depend-in-project-only'
    52540245 Tests: Add test for CMAKE_DEPENDS_IN_PROJECT_ONLY variable


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b06e17da7b4137d22ae7cfcf14c6aa3205577822
commit b06e17da7b4137d22ae7cfcf14c6aa3205577822
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 22 16:04:25 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 23 14:03:01 2016 -0400

    Help: Add notes for topic 'cmake-depend-in-project-only'

diff --git a/Help/release/dev/cmake-depend-in-project-only.rst b/Help/release/dev/cmake-depend-in-project-only.rst
new file mode 100644
index 0000000..8553e80
--- /dev/null
+++ b/Help/release/dev/cmake-depend-in-project-only.rst
@@ -0,0 +1,6 @@
+cmake-depend-in-project-only
+----------------------------
+
+* The :ref:`Makefile Generators` learned to optionally limit dependency
+  scanning only to files in the project source and build trees.
+  See the :variable:`CMAKE_DEPENDS_IN_PROJECT_ONLY` variable.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=525402450a1ccde0e9187c9613752f728a96149b
commit 525402450a1ccde0e9187c9613752f728a96149b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 22 16:03:28 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 23 14:03:01 2016 -0400

    Tests: Add test for CMAKE_DEPENDS_IN_PROJECT_ONLY variable

diff --git a/Tests/RunCMake/BuildDepends/MakeInProjectOnly.c b/Tests/RunCMake/BuildDepends/MakeInProjectOnly.c
new file mode 100644
index 0000000..bcb8745
--- /dev/null
+++ b/Tests/RunCMake/BuildDepends/MakeInProjectOnly.c
@@ -0,0 +1,2 @@
+#include <MakeInProjectOnly.h>
+int main() { return MakeInProjectOnly(); }
diff --git a/Tests/RunCMake/BuildDepends/MakeInProjectOnly.cmake b/Tests/RunCMake/BuildDepends/MakeInProjectOnly.cmake
new file mode 100644
index 0000000..add9aeb
--- /dev/null
+++ b/Tests/RunCMake/BuildDepends/MakeInProjectOnly.cmake
@@ -0,0 +1,16 @@
+enable_language(C)
+get_filename_component(include_dir "${CMAKE_BINARY_DIR}" PATH)
+include_directories("${include_dir}")
+add_executable(MakeInProjectOnly MakeInProjectOnly.c)
+set(CMAKE_DEPENDS_IN_PROJECT_ONLY 1)
+file(GENERATE OUTPUT check-$<LOWER_CASE:$<CONFIG>>.cmake CONTENT "
+if (check_step EQUAL 1)
+  set(check_pairs
+    \"$<TARGET_FILE:MakeInProjectOnly>|${include_dir}/MakeInProjectOnly.h\"
+    )
+else()
+  set(check_pairs
+    \"${include_dir}/MakeInProjectOnly.h|\$<TARGET_FILE:MakeInProjectOnly>\"
+    )
+endif()
+")
diff --git a/Tests/RunCMake/BuildDepends/MakeInProjectOnly.step1.cmake b/Tests/RunCMake/BuildDepends/MakeInProjectOnly.step1.cmake
new file mode 100644
index 0000000..d6551ab
--- /dev/null
+++ b/Tests/RunCMake/BuildDepends/MakeInProjectOnly.step1.cmake
@@ -0,0 +1,3 @@
+file(WRITE "${RunCMake_TEST_BINARY_DIR}/../MakeInProjectOnly.h" [[
+int MakeInProjectOnly(void) { return 0; }
+]])
diff --git a/Tests/RunCMake/BuildDepends/MakeInProjectOnly.step2.cmake b/Tests/RunCMake/BuildDepends/MakeInProjectOnly.step2.cmake
new file mode 100644
index 0000000..145605b
--- /dev/null
+++ b/Tests/RunCMake/BuildDepends/MakeInProjectOnly.step2.cmake
@@ -0,0 +1,3 @@
+file(WRITE "${RunCMake_TEST_BINARY_DIR}/../MakeInProjectOnly.h" [[
+int MakeInProjectOnly(void) { return 1; }
+]])
diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
index 26ffcc0..6b2b85a 100644
--- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
+++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
@@ -41,6 +41,11 @@ endif()
 
 run_BuildDepends(Custom-Always)
 
+if(RunCMake_GENERATOR MATCHES "Make" AND
+   NOT "${RunCMake_BINARY_DIR}" STREQUAL "${RunCMake_SOURCE_DIR}")
+  run_BuildDepends(MakeInProjectOnly)
+endif()
+
 function(run_ReGeneration)
   # test re-generation of project even if CMakeLists.txt files disappeared
 

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

Summary of changes:


hooks/post-receive
-- 
CMake