From: <ai...@us...> - 2013-06-13 03:13:57
|
Revision: 12383 http://sourceforge.net/p/plplot/code/12383 Author: airwin Date: 2013-06-13 03:13:53 +0000 (Thu, 13 Jun 2013) Log Message: ----------- Protect against configuring a build twice in one CMake call, Modified Paths: -------------- trunk/cmake/build_projects/libagg/bp.cmake trunk/cmake/build_projects/libharu/bp.cmake trunk/cmake/build_projects/libqhull/bp.cmake trunk/cmake/build_projects/ndiff/bp.cmake trunk/cmake/build_projects/plplot/bp.cmake trunk/cmake/build_projects/shapelib/bp.cmake trunk/cmake/build_projects/wxwidgets/bp.cmake Modified: trunk/cmake/build_projects/libagg/bp.cmake =================================================================== --- trunk/cmake/build_projects/libagg/bp.cmake 2013-06-13 02:53:11 UTC (rev 12382) +++ trunk/cmake/build_projects/libagg/bp.cmake 2013-06-13 03:13:53 UTC (rev 12383) @@ -26,6 +26,12 @@ set(BP_PACKAGE libagg) +# Protect against configuring a build twice in one CMake call +if(${BP_PACKAGE}_configured) + return() +endif(${BP_PACKAGE}_configured) +set(${BP_PACKAGE}_configured ON) + # Data that is related to downloads. set(${BP_PACKAGE}_URL http://www.antigrain.com/agg-2.5.tar.gz) set(${BP_PACKAGE}_URL_MD5 0229a488bc47be10a2fee6cf0b2febd6) Modified: trunk/cmake/build_projects/libharu/bp.cmake =================================================================== --- trunk/cmake/build_projects/libharu/bp.cmake 2013-06-13 02:53:11 UTC (rev 12382) +++ trunk/cmake/build_projects/libharu/bp.cmake 2013-06-13 03:13:53 UTC (rev 12383) @@ -26,6 +26,12 @@ set(BP_PACKAGE libharu) +# Protect against configuring a build twice in one CMake call +if(${BP_PACKAGE}_configured) + return() +endif(${BP_PACKAGE}_configured) +set(${BP_PACKAGE}_configured ON) + # Data that is related to downloads. set(${BP_PACKAGE}_URL http://${BP_PACKAGE}.org/files/${BP_PACKAGE}-2.1.0.tar.gz) set(${BP_PACKAGE}_URL_MD5 0623b8fb08ae1b28af08b2cdbd66b662) Modified: trunk/cmake/build_projects/libqhull/bp.cmake =================================================================== --- trunk/cmake/build_projects/libqhull/bp.cmake 2013-06-13 02:53:11 UTC (rev 12382) +++ trunk/cmake/build_projects/libqhull/bp.cmake 2013-06-13 03:13:53 UTC (rev 12383) @@ -26,6 +26,12 @@ set(BP_PACKAGE libqhull) +# Protect against configuring a build twice in one CMake call +if(${BP_PACKAGE}_configured) + return() +endif(${BP_PACKAGE}_configured) +set(${BP_PACKAGE}_configured ON) + # Data that is related to downloads. set(${BP_PACKAGE}_URL http://www.qhull.org/download/qhull-2010.1-src.tgz) set(${BP_PACKAGE}_URL_MD5 e64138470acdeb18f752a0bc2a11ceb4) Modified: trunk/cmake/build_projects/ndiff/bp.cmake =================================================================== --- trunk/cmake/build_projects/ndiff/bp.cmake 2013-06-13 02:53:11 UTC (rev 12382) +++ trunk/cmake/build_projects/ndiff/bp.cmake 2013-06-13 03:13:53 UTC (rev 12383) @@ -26,6 +26,12 @@ set(BP_PACKAGE ndiff) +# Protect against configuring a build twice in one CMake call +if(${BP_PACKAGE}_configured) + return() +endif(${BP_PACKAGE}_configured) +set(${BP_PACKAGE}_configured ON) + # Data that is related to downloads. set(${BP_PACKAGE}_URL ftp://ftp.math.utah.edu/pub/misc/${BP_PACKAGE}-2.00.tar.gz) Modified: trunk/cmake/build_projects/plplot/bp.cmake =================================================================== --- trunk/cmake/build_projects/plplot/bp.cmake 2013-06-13 02:53:11 UTC (rev 12382) +++ trunk/cmake/build_projects/plplot/bp.cmake 2013-06-13 03:13:53 UTC (rev 12383) @@ -25,6 +25,14 @@ # operate. # Configure build of PLplot dependencies. +set(BP_PACKAGE plplot) + +# Protect against configuring a build twice in one CMake call +if(${BP_PACKAGE}_configured) + return() +endif(${BP_PACKAGE}_configured) +set(${BP_PACKAGE}_configured ON) + include(shapelib/bp.cmake) include(libqhull/bp.cmake) include(libharu/bp.cmake) Modified: trunk/cmake/build_projects/shapelib/bp.cmake =================================================================== --- trunk/cmake/build_projects/shapelib/bp.cmake 2013-06-13 02:53:11 UTC (rev 12382) +++ trunk/cmake/build_projects/shapelib/bp.cmake 2013-06-13 03:13:53 UTC (rev 12383) @@ -26,6 +26,12 @@ set(BP_PACKAGE shapelib) +# Protect against configuring a build twice in one CMake call +if(${BP_PACKAGE}_configured) + return() +endif(${BP_PACKAGE}_configured) +set(${BP_PACKAGE}_configured ON) + # Data that is related to downloads. set(${BP_PACKAGE}_URL http://download.osgeo.org/${BP_PACKAGE}/${BP_PACKAGE}-1.3.0.tar.gz) set(${BP_PACKAGE}_URL_MD5 2ff7d0b21d4b7506b452524492795f77) Modified: trunk/cmake/build_projects/wxwidgets/bp.cmake =================================================================== --- trunk/cmake/build_projects/wxwidgets/bp.cmake 2013-06-13 02:53:11 UTC (rev 12382) +++ trunk/cmake/build_projects/wxwidgets/bp.cmake 2013-06-13 03:13:53 UTC (rev 12383) @@ -26,6 +26,12 @@ set(BP_PACKAGE wxwidgets) +# Protect against configuring a build twice in one CMake call +if(${BP_PACKAGE}_configured) + return() +endif(${BP_PACKAGE}_configured) +set(${BP_PACKAGE}_configured ON) + # Data that is related to downloads. set(${BP_PACKAGE}_URL http://prdownloads.sourceforge.net/wxwindows/wxWidgets-2.8.12.tar.gz) set(${BP_PACKAGE}_URL_MD5 2fa39da14bc06ea86fe902579fedc5b1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |