Revision: 76756
http://sourceforge.net/p/brlcad/code/76756
Author: starseeker
Date: 2020-08-14 18:55:22 +0000 (Fri, 14 Aug 2020)
Log Message:
-----------
See if we can trigger the distclean target portably using CMake
Modified Paths:
--------------
brlcad/branches/RELEASE/CMakeLists.txt
Modified: brlcad/branches/RELEASE/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/CMakeLists.txt 2020-08-14 18:46:44 UTC (rev
76755)
+++ brlcad/branches/RELEASE/CMakeLists.txt 2020-08-14 18:55:22 UTC (rev
76756)
@@ -3737,25 +3737,12 @@
get_property(CMAKE_DISTCLEAN_TARGET_LIST GLOBAL PROPERTY
CMAKE_DISTCLEAN_TARGET_LIST)
list(REMOVE_DUPLICATES CMAKE_DISTCLEAN_TARGET_LIST)
configure_file("${BRLCAD_CMAKE_DIR}/distclean.cmake.in"
"${BRLCAD_BINARY_DIR}/distclean.cmake" @ONLY)
-if("${CMAKE_GENERATOR}" MATCHES "Make")
- add_custom_target(distclean
- COMMAND ${CMAKE_COMMAND} -E echo "Running make clean..."
- COMMAND ${CMAKE_COMMAND} -E chdir "${BRLCAD_BINARY_DIR}" $(MAKE) clean
- COMMAND ${CMAKE_COMMAND} -E echo "Running make clean... done."
- COMMAND ${CMAKE_COMMAND} -P "${BRLCAD_BINARY_DIR}/distclean.cmake"
- )
-elseif("${CMAKE_GENERATOR}" MATCHES "Ninja")
- add_custom_target(distclean
- COMMAND ${CMAKE_COMMAND} -E echo "Running make clean..."
- COMMAND ${CMAKE_COMMAND} -E chdir "${BRLCAD_BINARY_DIR}" ninja -t clean
- COMMAND ${CMAKE_COMMAND} -E echo "Running make clean... done."
- COMMAND ${CMAKE_COMMAND} -P "${BRLCAD_BINARY_DIR}/distclean.cmake"
- )
-else("${CMAKE_GENERATOR}" MATCHES "Make")
- add_custom_target(distclean
- COMMAND ${CMAKE_COMMAND} -E echo "Not implemented for generator
${CMAKE_GENERATOR}"
- )
-endif("${CMAKE_GENERATOR}" MATCHES "Make")
+add_custom_target(distclean
+ COMMAND ${CMAKE_COMMAND} -E echo "Running clean target..."
+ COMMAND ${CMAKE_COMMAND} --build ${BRLCAD_BINARY_DIR} --target clean
+ COMMAND ${CMAKE_COMMAND} -E echo "Running clean target... done."
+ COMMAND ${CMAKE_COMMAND} -P "${BRLCAD_BINARY_DIR}/distclean.cmake"
+ )
if(TARGET distclean)
set_target_properties(distclean PROPERTIES FOLDER "Compilation Utilities")
endif(TARGET distclean)
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
