Revision: 77634
http://sourceforge.net/p/brlcad/code/77634
Author: starseeker
Date: 2020-10-24 13:44:01 +0000 (Sat, 24 Oct 2020)
Log Message:
-----------
Make a few updates for distcheck - in particular, don't fail on the presense of
.ninja_log after cleanup since we can't eliminate it while running ninja to do
the cleanup.
Modified Paths:
--------------
brlcad/branches/extbuild/CMakeLists.txt
brlcad/branches/extbuild/misc/CMake/distcheck_no_tcl.cmake.in
brlcad/branches/extbuild/misc/CMake/distcheck_target.cmake.in
brlcad/branches/extbuild/src/libged/brep/CMakeLists.txt
Modified: brlcad/branches/extbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/CMakeLists.txt 2020-10-24 13:13:55 UTC (rev
77633)
+++ brlcad/branches/extbuild/CMakeLists.txt 2020-10-24 13:44:01 UTC (rev
77634)
@@ -161,7 +161,7 @@
set(DISTCLEAN_OUTFILES ${DISTCLEAN_OUTFILES} Makefile)
endif("${CMAKE_GENERATOR}" MATCHES "Make")
if("${CMAKE_GENERATOR}" MATCHES "Ninja")
- set(DISTCLEAN_OUTFILES ${DISTCLEAN_OUTFILES} build.ninja rules.ninja)
+ set(DISTCLEAN_OUTFILES ${DISTCLEAN_OUTFILES} build.ninja rules.ninja
.ninja_log)
endif("${CMAKE_GENERATOR}" MATCHES "Ninja")
#---------------------------------------------------------------------
@@ -2278,10 +2278,10 @@
foreach(clearpattern ${DISTCLEAN_OUTFILES})
DISTCLEAN("${CMAKE_BINARY_DIR}/${clearpattern}")
endforeach(clearpattern ${DISTCLEAN_OUTFILES})
- if("${CMAKE_GENERATOR}" MATCHES "Ninja")
+ if("${CMAKE_GENERATOR}" MATCHES "Ninja*")
DISTCLEAN("${CMAKE_BINARY_DIR}/.ninja_log")
DISTCLEAN("${CMAKE_BINARY_DIR}/.ninja_deps")
- endif("${CMAKE_GENERATOR}" MATCHES "Ninja")
+ endif("${CMAKE_GENERATOR}" MATCHES "Ninja*")
#
----------------------------------------------------------------------------
# Define a distcheck target. This performs a variety of tests to determine
Modified: brlcad/branches/extbuild/misc/CMake/distcheck_no_tcl.cmake.in
===================================================================
--- brlcad/branches/extbuild/misc/CMake/distcheck_no_tcl.cmake.in
2020-10-24 13:13:55 UTC (rev 77633)
+++ brlcad/branches/extbuild/misc/CMake/distcheck_no_tcl.cmake.in
2020-10-24 13:44:01 UTC (rev 77634)
@@ -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/branches/extbuild/misc/CMake/distcheck_target.cmake.in
===================================================================
--- brlcad/branches/extbuild/misc/CMake/distcheck_target.cmake.in
2020-10-24 13:13:55 UTC (rev 77633)
+++ brlcad/branches/extbuild/misc/CMake/distcheck_target.cmake.in
2020-10-24 13:44:01 UTC (rev 77634)
@@ -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/branches/extbuild/src/libged/brep/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/libged/brep/CMakeLists.txt 2020-10-24
13:13:55 UTC (rev 77633)
+++ brlcad/branches/extbuild/src/libged/brep/CMakeLists.txt 2020-10-24
13:44:01 UTC (rev 77634)
@@ -12,6 +12,7 @@
OUT_SRC_FILE ${DPLOT_READER}_parser.c
OUT_HDR_FILE ${DPLOT_READER}_parser.h)
ADD_PERPLEX_LEMON_DEPENDENCY(${DPLOT_READER}_scanner ${DPLOT_READER}_parser)
+DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/dplot_parser_dplot_parser/dplot_parser.lemon")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
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
