Revision: 76757
http://sourceforge.net/p/brlcad/code/76757
Author: starseeker
Date: 2020-08-14 19:04:09 +0000 (Fri, 14 Aug 2020)
Log Message:
-----------
More distclean fixes - ninja distclean now works after regress
Modified Paths:
--------------
brlcad/branches/RELEASE/misc/CMake/BRLCAD_Util.cmake
brlcad/branches/RELEASE/regress/burst/CMakeLists.txt
Modified: brlcad/branches/RELEASE/misc/CMake/BRLCAD_Util.cmake
===================================================================
--- brlcad/branches/RELEASE/misc/CMake/BRLCAD_Util.cmake 2020-08-14
18:55:22 UTC (rev 76756)
+++ brlcad/branches/RELEASE/misc/CMake/BRLCAD_Util.cmake 2020-08-14
19:04:09 UTC (rev 76757)
@@ -45,12 +45,12 @@
define_property(GLOBAL PROPERTY CMAKE_DISTCLEAN_TARGET_LIST BRIEF_DOCS "All
CMake generated files" FULL_DOCS "List of all files generated by CMake")
function(distclean)
foreach(item ${ARGN})
- get_filename_component(item_abs ${item} ABSOLUTE)
- if ("${item_abs}" STREQUAL "${item}")
+ get_filename_component(item_dir ${item} DIRECTORY)
+ if ("${item_dir}" STREQUAL "")
+ set(item_path "${CMAKE_CURRENT_BINARY_DIR}/${item}")
+ else ("${item_dir}" STREQUAL "")
set(item_path "${item}")
- else ("${item_abs}" STREQUAL "${item}")
- set(item_path "${CMAKE_CURRENT_BINARY_DIR}/${item}")
- endif ("${item_abs}" STREQUAL "${item}")
+ endif ("${item_dir}" STREQUAL "")
set_property(GLOBAL APPEND PROPERTY CMAKE_DISTCLEAN_TARGET_LIST
"${item_path}")
endforeach(item ${ARGN})
endfunction(distclean)
Modified: brlcad/branches/RELEASE/regress/burst/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/regress/burst/CMakeLists.txt 2020-08-14
18:55:22 UTC (rev 76756)
+++ brlcad/branches/RELEASE/regress/burst/CMakeLists.txt 2020-08-14
19:04:09 UTC (rev 76757)
@@ -16,17 +16,13 @@
ktank.g
ktank_burst.shotlines
burst_ktank.log
+ regress-burst.log
)
- foreach(BCF ${BURST_CLEAN_FILES})
- DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/${BCF}")
- endforeach(BCF ${BURST_CLEAN_FILES})
- DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/regress-burst.log")
+ DISTCLEAN(${BURST_CLEAN_FILES})
# If we copied the input files, clear them out as well
if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
- foreach(BIF ${BURST_INPUT_FILES})
- DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/${BCF}")
- endforeach(BIF ${BURST_INPUT_FILES})
+ DISTCLEAN(${BURST_INPUT_FILES})
endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL
"${CMAKE_CURRENT_BINARY_DIR}")
endif (TARGET ktank.g)
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
