Commit Graph

26 Commits

Author SHA1 Message Date
Brad King 6dde154313 CMake 2.8.1-rc4
This commit cherry-picks and squashes the following commits:

  4685872 "FortranCInterface: Fix PathScale detection..." (2010-02-16)
  b39fe94 "Fix problem with ExternalProject test..." (2010-02-17)
  70290e1 "Add support for QtDeclartive module" (2010-02-17)
  282ba89 "Clarify CMAKE_MODULE_PATH documentation" (2010-02-18)
  4eba05d "Suppress GNU flag -fPIC on Windows" (2010-02-19)
  57efb4a "BUG: We shouldn't be setting the HideWindow..." (2010-02-19)
2010-03-05 08:19:39 -05:00
David Cole 002ae925c3 Use more verbose/descriptive names for the "public API" functions in the ExternalProject.cmake module. Follow the cmake function naming convention, using a ModuleFileName_ prefix. Locate stamp files under a CMAKE_CFG_INTDIR subdir of the stamp dir so that debug and release builds have separate stamp files for Visual Studio builds. If no CMAKE_GENERATOR argument is given to ExternalProject_Add, default to using the parent project's cmake generator. 2009-09-08 15:37:15 -04:00
David Cole 5624be360e Add test step to ExternalProject builds. Rename SVN_TAG to SVN_REVISION since it is a more accurate name. 2009-09-03 12:11:14 -04:00
David Cole 44878e7b11 BUG: Exclude svn portions of ExternalProject test when: svn client version is less than 1.2 or cygwin/non-cygwin mismatch detected -- avoids ExternalProject test failures on dash5 and dash22-cygwin. Also, non-code change: allow cvslock through Windows firewall to prevent ExternalProject test failure on dash1vista32. 2009-07-01 13:48:38 -04:00
David Cole fb81cd93f0 BUG: Avoid running the cvs portions of the ExternalProject test on non-cygwin builds that are using cygwin cvs.exe. 2009-06-29 10:46:45 -04:00
David Cole 0e6c530e9e BUG: Downgrade svn repository to be created with an svn 1.2 installation (rather than 1.4) so that it works (hopefully) with more svn clients in the wild. Change time stamps of test projects in CMakeLists.txt to reflect times available in newly created repository. Add UPDATE_COMMAND "" for checkouts that are tag-based or date-stamp-based to avoid unnecessary update steps. 2009-06-26 13:00:39 -04:00
David Cole 688db8a17d ENH: Do not unzip the local repositories unless CVS and SVN executables are available. Add 'configure' step to the repository extraction 'projects' to print the version number of CVS and SVN in the dashboard test/build output. 2009-06-26 11:32:04 -04:00
David Cole f23668a919 ENH: Revise the ExternalProject test to use local CVS and SVN repositories to avoid network activity. Also: stop building KWStyle and kwsys as part of this test to reduce the amount of time spent running the test. Instead, build TutorialStep1 as retrieved from the new local repositories with various tags, date stamps and revision numbers. 2009-06-26 09:55:35 -04:00
David Cole f96f7f8612 ENH: Add *.tgz files of cvs and svn repositories containing the TutorialStep1 project to test cvs and svn capabilities of ExternalProject without requiring network activity. 2009-06-25 12:03:00 -04:00
Brad King 031379abe6 ENH: New ExternalProject.cmake module interface
This creates new module ExternalProject.cmake to replace the prototype
AddExternalProject.cmake module.  The interface is more refined, more
flexible, and better documented than the prototype.

This also converts the ExternalProject test to use the new module.  The
old module will be removed (it was never in a CMake release) after
projects using it have been converted to the new module.
2009-06-24 15:03:26 -04:00
Brad King 68248be52e ENH: Allow lists in AddExternalProject arguments
The add_external_project function separates its arguments with ';'
separators, so previously no command line argument could contain one.
When specifying CMAKE_ARGS, some -D argument values may need to contain
a semicolon to form lists in the external project cache.

This adds add_external_project argument LIST_SEPARATOR to specify a list
separator string.  The separator is replaced by ';' in arguments to any
command created to drive the external project.  For example:

  add_external_project(...
    LIST_SEPARATOR ::
    CMAKE_ARGS -DSOME_LIST:STRING=A::B::C
    ...)

passes "-DSOME_LIST:STRING=A;B;C" to CMake for the external project.
2009-04-09 13:56:08 -04:00
Brad King d2175580e7 ENH: Generalize AddExternalProject step creation
This creates function 'add_external_project_step' to centralize creation
of external project steps.  Users may call it to add custom steps to
external project builds.
2009-03-30 11:36:32 -04:00
Brad King 2cc46c12f8 ENH: Add patch step for add_external_project
The patch step runs parallel to the update step since it does not make
sense to have both.  Configuration of the step requires specification of
a PATCH_COMMAND argument to add_external_project.
2009-03-18 11:01:02 -04:00
Brad King 6ae0ff626a ENH: Improve add_external_project interface
This rewrites the keyword/argument parsing and handling in the
AddExternalProject module to use arguments more literally:

  - The strict keyword-value pairing is gone in favor of keywords with
    arbitrary non-keyword values.  This avoids requiring users to escape
    spaces and quotes in command lines.

  - Customized step command lines are now specified with a single
    keyword <step>_COMMAND instead of putting the arguments in a
    separate entry (previously called <step>_ARGS).

  - Build step custom commands now use VERBATIM mode so that arguments
    are correctly escaped on the command line during builds.
2009-03-18 11:00:30 -04:00
Brad King ba5cbf0fb1 ENH: Better recursive make in AddExternalProject
This teaches AddExternalProject to run "$(MAKE)" for build and install
steps of CMake-based external projects when using a Makefile generator.
It allows the external project to participate in a parallel make invoked
on the superproject.
2009-03-04 11:45:42 -05:00
David Cole 5d9e78e918 ENH: Re-work of fix committed yesterday for the Watcom WMake dashboard. Fix it properly by using the SYMBOLIC source file property to indicate to WMake when the sentinel file is not actually written by the update step. 2008-12-24 10:10:40 -05:00
David Cole 2f90c29be1 BUG: Workaround for Watcom WMake not handling "always out of date" custom commands to fix the failing ExternalProject test on the CMake nightly dashboard. 2008-12-23 10:01:53 -05:00
David Cole 3ddb9dfdea BUG: One more conditional in the ExternalProject test to prevent build errors of Tutorial Step5 on Win98 using Visual Studio 6 when the path length of its build tree exceeds 72 characters. Crazy, perhaps. But this fixes the last real dashboard failure of the ExternalProject test. 2008-12-11 15:55:46 -05:00
David Cole 4f217f0361 BUG: Prevent KWStyle portion of ExternalProject test from configuring, building, installing and testing on WATCOM dashboards. WATCOM STL support is still under development. 2008-12-10 11:30:51 -05:00
David Cole 994ad3633e COMP: No-op. White space only change to trigger a re-run of the ExternalProject test on the QNX continuous dashboard to pick up the latest KWStyle changes. 2008-12-05 17:54:39 -05:00
David Cole fd644d1cb9 COMP: No-op. White space only change to trigger a re-run of the ExternalProject test on the QNX continuous dashboard to pick up the latest KWStyle changes. 2008-12-05 17:18:11 -05:00
David Cole 2540d84c02 COMP: No-op. White space only change to trigger a re-run of the ExternalProject test on the QNX continuous dashboard to pick up the latest KWStyle changes. 2008-12-05 16:46:52 -05:00
David Cole 527e2b8881 COMP: No-op. White space only change to trigger a re-run of the ExternalProject test on the QNX continuous dashboard to pick up the latest KWStyle changes. 2008-12-05 16:13:45 -05:00
David Cole dba2c51d90 ENH: Make it easier to use configure/make/make-install as the build steps for an external project. Add capability of customizing the download step. Add tests of empty projects. Better comments and error checking in AddExternalProject.cmake. In tests, use KWStyle from CVSHEAD to see if QNX continuous can build the latest KWStyle. Make KWStyle test depend on all previous test external projects so it builds last to catch other issues before any KWStyle compile errors. 2008-12-05 15:18:32 -05:00
David Cole 67ebcb9597 ENH: Use a TryCheckout technique to decide whether or not to attempt building the projects that depend on a cvs or svn download method. 2008-12-04 15:30:37 -05:00
David Cole 930827d48c ENH: First draft of add_external_project functionality. Tweaks, dashboard fixing, more tests and documentation certain to follow as it gets used by others... 2008-12-04 13:27:48 -05:00