Revision: 51729
http://brlcad.svn.sourceforge.net/brlcad/?rev=51729&view=rev
Author: starseeker
Date: 2012-07-31 17:55:11 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
distcheck cleanups
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/misc/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2012-07-31 16:59:03 UTC (rev 51728)
+++ brlcad/trunk/CMakeLists.txt 2012-07-31 17:55:11 UTC (rev 51729)
@@ -327,11 +327,12 @@
# For cleaning files as part of the distclean command, CMake needs
# to be aware of what various generators will (or might) write out
# in each build directory.
+set(DISTCLEAN_OUTFILES CTestTestfile.cmake)
if("${CMAKE_GENERATOR}" MATCHES "Make")
- set(DISTCLEAN_OUTFILES Makefile)
+ set(DISTCLEAN_OUTFILES ${DISTCLEAN_OUTFILES} Makefile)
endif("${CMAKE_GENERATOR}" MATCHES "Make")
if("${CMAKE_GENERATOR}" MATCHES "Ninja")
- set(DISTCLEAN_OUTFILES build.ninja rules.ninja)
+ set(DISTCLEAN_OUTFILES ${DISTCLEAN_OUTFILES} build.ninja rules.ninja)
endif("${CMAKE_GENERATOR}" MATCHES "Ninja")
#---------------------------------------------------------------------
Modified: brlcad/trunk/misc/CMakeLists.txt
===================================================================
--- brlcad/trunk/misc/CMakeLists.txt 2012-07-31 16:59:03 UTC (rev 51728)
+++ brlcad/trunk/misc/CMakeLists.txt 2012-07-31 17:55:11 UTC (rev 51729)
@@ -23,6 +23,7 @@
DESTINATION ${CMAKE_BINARY_DIR}/${BIN_DIR}
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ DISTCLEAN(${CMAKE_BINARY_DIR}/${BIN_DIR}/brlcad-config)
file(REMOVE ${CMAKE_BINARY_DIR}/misc/brlcad-config)
install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/brlcad-config DESTINATION
${BIN_DIR})
else(NOT CMAKE_CONFIGURATION_TYPES)
@@ -33,6 +34,7 @@
DESTINATION ${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/${BIN_DIR}
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ DISTCLEAN(${CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}}/${BIN_DIR}/brlcad-config)
file(REMOVE ${CMAKE_BINARY_DIR}/${CFG_TYPE_UPPER}/misc/brlcad-config)
endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
install(PROGRAMS ${CMAKE_BINARY_DIR}/\${BUILD_TYPE}/bin/brlcad-config
DESTINATION ${BIN_DIR})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
