Revision: 77917
http://sourceforge.net/p/brlcad/code/77917
Author: starseeker
Date: 2020-12-04 00:47:57 +0000 (Fri, 04 Dec 2020)
Log Message:
-----------
Ninja will ensure a .ninja_log file exists - adjust for that when doing
distcheck.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/distcheck_no_tcl.cmake.in
brlcad/trunk/misc/CMake/distcheck_target.cmake.in
Modified: brlcad/trunk/misc/CMake/distcheck_no_tcl.cmake.in
===================================================================
--- brlcad/trunk/misc/CMake/distcheck_no_tcl.cmake.in 2020-12-04 00:46:05 UTC
(rev 77916)
+++ brlcad/trunk/misc/CMake/distcheck_no_tcl.cmake.in 2020-12-04 00:47:57 UTC
(rev 77917)
@@ -35,6 +35,10 @@
###
set(check_distcheck
"file(GLOB_RECURSE BUILD_DIR_CONTENTS RELATIVE
\"${CMAKE_CURRENT_BINARY_DIR}/distcheck-${TARGET_SUFFIX}/${build_dir}\"
\"${CMAKE_CURRENT_BINARY_DIR}/distcheck-${TARGET_SUFFIX}/${build_dir}/*\")
+# Ninja keeps a running log in .ninja_log - if we're using ninja itself to run
the
+# tests, we can't clear this file. Ignore it, as it's not a sign of a problem
with
+# the clean logic.
+list(REMOVE_ITEM BUILD_DIR_CONTENTS .ninja_log)
if(BUILD_DIR_CONTENTS)
message(\"Files present after distclean in
${CMAKE_CURRENT_BINARY_DIR}/distcheck-${TARGET_SUFFIX}/${build_dir}:\")
foreach(filename \${BUILD_DIR_CONTENTS})
Modified: brlcad/trunk/misc/CMake/distcheck_target.cmake.in
===================================================================
--- brlcad/trunk/misc/CMake/distcheck_target.cmake.in 2020-12-04 00:46:05 UTC
(rev 77916)
+++ brlcad/trunk/misc/CMake/distcheck_target.cmake.in 2020-12-04 00:47:57 UTC
(rev 77917)
@@ -35,6 +35,10 @@
###
set(check_distcheck
"file(GLOB_RECURSE BUILD_DIR_CONTENTS RELATIVE
\"${CMAKE_CURRENT_BINARY_DIR}/distcheck-${TARGET_SUFFIX}/${build_dir}\"
\"${CMAKE_CURRENT_BINARY_DIR}/distcheck-${TARGET_SUFFIX}/${build_dir}/*\")
+# Ninja keeps a running log in .ninja_log - if we're using ninja itself to run
the
+# tests, we can't clear this file. Ignore it, as it's not a sign of a problem
with
+# the clean logic.
+list(REMOVE_ITEM BUILD_DIR_CONTENTS .ninja_log)
if(BUILD_DIR_CONTENTS)
message(\"Files present after distclean in
${CMAKE_CURRENT_BINARY_DIR}/distcheck-${TARGET_SUFFIX}/${build_dir}:\")
foreach(filename \${BUILD_DIR_CONTENTS})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
