Revision: 55775
http://sourceforge.net/p/brlcad/code/55775
Author: starseeker
Date: 2013-06-14 01:41:53 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
No longer need autotools distcheck as part of CMake distcheck-full.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Removed Paths:
-------------
brlcad/trunk/misc/CMake/distcheck_autotools.cmake.in
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2013-06-14 00:58:07 UTC (rev 55774)
+++ brlcad/trunk/CMakeLists.txt 2013-06-14 01:41:53 UTC (rev 55775)
@@ -2213,10 +2213,6 @@
CREATE_DISTCHECK(odd_pathnames "-DCMAKE_BUILD_TYPE=Debug
-DBRLCAD_BUNDLED_LIBS=BUNDLED" "1 Odd_ source dir ++" "1 Odd_ build dir ++" "1
Odd_ install dir ++")
CREATE_DISTCHECK(in_src_dir "-DCMAKE_BUILD_TYPE=Debug
-DBRLCAD_BUNDLED_LIBS=BUNDLED" "${CPACK_SOURCE_PACKAGE_FILE_NAME}"
"${CPACK_SOURCE_PACKAGE_FILE_NAME}" "install" distcheck_in_src_dir.cmake.in)
- # The following target can (and should) be removed once Autotools
- # deprecation is complete
- CREATE_DISTCHECK(autotools "" "${CPACK_SOURCE_PACKAGE_FILE_NAME}"
"${CPACK_SOURCE_PACKAGE_FILE_NAME}" "install" distcheck_autotools.cmake.in)
-
# Now that we're set up and have added the extra targets we want for
distcheck-full, define the build targets
DEFINE_DISTCHECK_TARGET(STD)
endif(NOT BRLCAD_IS_SUBBUILD)
Deleted: brlcad/trunk/misc/CMake/distcheck_autotools.cmake.in
===================================================================
--- brlcad/trunk/misc/CMake/distcheck_autotools.cmake.in 2013-06-14
00:58:07 UTC (rev 55774)
+++ brlcad/trunk/misc/CMake/distcheck_autotools.cmake.in 2013-06-14
01:41:53 UTC (rev 55775)
@@ -1,63 +0,0 @@
-# D I S T C H E C K _ I N _ S R C _ D I R . C M A K E . I N
-# BRL-CAD
-#
-# Copyright (c) 2012-2013 United States Government as represented by
-# the U.S. Army Research Laboratory.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-###
-add_custom_target(distcheck-${TARGET_SUFFIX}
- COMMAND ${CMAKE_COMMAND} -E echo "-- distcheck-${TARGET_SUFFIX} - Extracting
TGZ archive..."
- COMMAND ${CMAKE_COMMAND} -E remove distcheck_${TARGET_SUFFIX}.log
- COMMAND ${CMAKE_COMMAND} -E remove_directory distcheck-${TARGET_SUFFIX}
- COMMAND ${CMAKE_COMMAND} -E make_directory distcheck-${TARGET_SUFFIX}
- COMMAND ${CMAKE_COMMAND} -E chdir distcheck-${TARGET_SUFFIX}
${CMAKE_COMMAND} -E tar xzf ../${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz
- COMMAND ${CMAKE_COMMAND} -E make_directory
distcheck-${TARGET_SUFFIX}/${install_dir}
- COMMAND ${CMAKE_COMMAND} -E echo "-- distcheck-${TARGET_SUFFIX} - Extracting
TGZ archive... Done."
- COMMAND ${CMAKE_COMMAND} -E echo "-- distcheck-${TARGET_SUFFIX} -
Configuring... "
- COMMAND ${CMAKE_COMMAND} -E chdir
distcheck-${TARGET_SUFFIX}/${CPACK_SOURCE_PACKAGE_FILE_NAME} ./autogen.sh
@TARGET_REDIRECT@
- COMMAND ${CMAKE_COMMAND} -E chdir
distcheck-${TARGET_SUFFIX}/${CPACK_SOURCE_PACKAGE_FILE_NAME} ./configure
--enable-all --enable-png-build @TARGET_REDIRECT@
- COMMAND ${CMAKE_COMMAND} -E echo "-- distcheck-${TARGET_SUFFIX} -
Configuring... Done."
- COMMAND ${CMAKE_COMMAND} -E echo "-- distcheck-${TARGET_SUFFIX} - Build
Autotools distcheck target using source from TGZ archive..."
- COMMAND ${CMAKE_COMMAND} -E chdir
distcheck-${TARGET_SUFFIX}/${CPACK_SOURCE_PACKAGE_FILE_NAME}
@DISTCHECK_BUILD_CMD@ distcheck @TARGET_REDIRECT@
- COMMAND ${CMAKE_COMMAND} -E echo "-- distcheck-${TARGET_SUFFIX} - Build
Autotools distcheck target using source from TGZ archive... Done."
- COMMAND ${CMAKE_COMMAND} -E echo "-- distcheck-${TARGET_SUFFIX} - Cleanup..."
- COMMAND ${CMAKE_COMMAND} -E remove_directory distcheck-${TARGET_SUFFIX}
- COMMAND ${CMAKE_COMMAND} -E echo "-- distcheck-${TARGET_SUFFIX} - Cleanup...
Done."
- COMMENT "[distcheck-${TARGET_SUFFIX}] Performing distcheck -
${TARGET_SUFFIX} configuration..."
- DEPENDS distcheck-source_archives
- )
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
