Commit Graph

16647 Commits

Author SHA1 Message Date
Brad King 414c35ebb2 Merge topic 'qt4-import-targets-mac'
e7f05d9 Add imported targets support for frameworks on Mac.
2011-06-14 13:23:37 -04:00
Brad King a652af77ce Merge topic 'qt4-useqt-module-deps'
5f983d1 Qt4: complete module dependencies in UseQt4.cmake
2011-06-14 13:23:33 -04:00
Brad King 0373e08f15 Merge topic 'gnu-isystem-flag-issue-12258'
33f5a83 GNU: Fix CMAKE_INCLUDE_SYSTEM_FLAG_<lang> value (#12258)
2011-06-14 13:23:28 -04:00
Brad King be555a042e Merge topic 'ImproveCPackRPMdoc'
2af80c7 Add some more Specs file tag handling.
05720c7 CPackRPM: Enhance documentation
2011-06-14 13:23:24 -04:00
Brad King f616f263cd Merge topic 'ctest-no-config-report-notrun'
a4ec242 CTest: Report tests not run due to unknown configuration
77ddb6a Use cascading-if for per-config test and install code
2011-06-14 13:23:20 -04:00
KWSys Robot cf1c3c102f KWSys Nightly Date Stamp 2011-06-14 00:12:44 -04:00
Clinton Stimpson 5f983d1706 Qt4: complete module dependencies in UseQt4.cmake 2011-06-13 17:37:26 -06:00
Clinton Stimpson e7f05d9759 Add imported targets support for frameworks on Mac. 2011-06-13 17:21:41 -06:00
Brad King 33f5a83a5d GNU: Fix CMAKE_INCLUDE_SYSTEM_FLAG_<lang> value (#12258)
Fix typo introduced by commit e28c16b4 (Split GNU compiler information
files, 2009-12-02).

Reported-by: Campbell Barton <ideasman42@gmail.com>
Suggested-by: Michael Hertling <mhertling@online.de>
2011-06-13 17:54:36 -04:00
KWSys Robot 46e3a6c9b9 KWSys Nightly Date Stamp 2011-06-13 00:12:06 -04:00
Eric NOULARD 2af80c76ee Add some more Specs file tag handling. 2011-06-12 12:49:44 +02:00
Eric NOULARD 05720c75c1 CPackRPM: Enhance documentation 2011-06-12 12:12:24 +02:00
KWSys Robot 05610bf283 KWSys Nightly Date Stamp 2011-06-12 00:11:49 -04:00
KWSys Robot 6e74e36320 KWSys Nightly Date Stamp 2011-06-11 00:13:05 -04:00
Brad King a4ec24269b CTest: Report tests not run due to unknown configuration
When add_test(NAME) is called without the CONFIGURATIONS argument then
the test is intended to run in any configuration.  In multi-config
generators like the VS IDE and Xcode tests created by add_test(NAME) can
only be run when testing a known configuration (otherwise there is no
way to generate the test command line).  If no test command line is
known for a particular configuration, or if no configuration is given to
ctest, report the test as not run instead of silently skipping it.

Also fix CMake's own TestsWorkingDirectory test invocation to correct a
previously silent failure exposed by this change.
2011-06-10 09:52:18 -04:00
Brad King 77ddb6a0cd Use cascading-if for per-config test and install code
When generating per-config blocks in test and install scripts replace
the form

  IF()
    # config == A
  ENDIF()
  IF()
    # config == B
  ENDIF()

with

  IF()
    # config == A
  ELSEIF()
    # config == B
  ELSE()
    # no config matches
  ENDIF()

for clarity and to support the else() case cleanly.
2011-06-10 09:25:46 -04:00
KWSys Robot 778cf7e5e6 KWSys Nightly Date Stamp 2011-06-10 00:13:04 -04:00
KWSys Robot 9ccefd55c5 KWSys Nightly Date Stamp 2011-06-09 00:12:04 -04:00
Brad King 98dc13e513 Merge topic 'xcode-source_groups-folders-issue-10039'
f09ba0f Fix style errors added by parent and grandparent
eeeeca1 XCode: Support target folders on XCode.
59ed84e Xcode: Support multiple level nesting of XCode folders (#10039)
d0a403f CMake: Move tokenize to cmSystemTools
2011-06-08 15:44:44 -04:00
Brad King 45adc8e8c1 Merge topic 'fix_vs10_custom_command_rulefiles'
9d406cd Fix for bug #11927, external project git clone step always runs vs10.
2011-06-08 15:44:30 -04:00
Brad King f09ba0f1a2 Fix style errors added by parent and grandparent 2011-06-08 07:54:33 -04:00
KWSys Robot 0f939ee164 KWSys Nightly Date Stamp 2011-06-08 00:13:16 -04:00
Brad King 06296ca3fd Merge topic 'eliminate-cvs-from-release-scripts'
b43af94 CMake: eliminate use of cvs in the Release scripts
2011-06-07 14:06:21 -04:00
Brad King 40792a1a15 Merge topic 'fix-12034-fixup-bundle-with-non-dotapp-exe'
51e16c0 BundleUtilities: Avoid test on Watcom dashboards (#12034)
41f962a Revert "BundleUtilities: Run test on Windows if either MSVC or dumpbin was found."
e17135e BundleUtilities: Add rpath to loadable modules in test.
8064044 BundleUtilities: Print reason for not loading module.so
f3de459 BundleUtilities: Run test on Windows if either MSVC or dumpbin was found.
900bf98 BundleUtilities: Disable running test on Windows unless using MSVC.
fa4dc08 BundleUtilities: Fix issues with custom target DEPENDS in test (#12034)
e40b79e BundleUtilities: Fix test when using xcode (#12034)
b68d3dc BundleUtilities: Fix regex to extract dependents from ldd (#12034)
7ac7b43 BundleUtilities: Work w/ non .app exes on Mac (#12034)
2011-06-07 14:06:09 -04:00
Brad King 43d3048582 Merge topic 'fix-BundleUtilities-cryptic-error-message'
8f0667c BundleUtilities: Avoid a cryptic and unhelpful error message
2011-06-07 14:05:57 -04:00
Brad King 313a633b85 Merge topic 'vs10_include_fix'
27aa446 One more try.  Use full path by default, and relative on broken compilers.
2dfc121 Use bin tree for inclues to avoid -I with spaces in the path.
6d29b4b Append and do not clobber CMAKE_CXX_FLAGS in the test.
7815e90 Fix for bug#10798.  VS10 did not append -I flags with COMPILE_FLAGS prop.
2011-06-07 14:04:00 -04:00
Brad King f0d3658102 Merge topic 'fix_leak'
dd52fc3 Fix a memory leak.
2011-06-07 14:03:56 -04:00
Brad King 33b3d10d6e Merge topic 'Xcode-universal-binary-depend-issue-11844'
44cdae9 Xcode: Fix parallel build depends with universal binaries (#11844)
2011-06-07 14:03:53 -04:00
Johan Björk eeeeca1082 XCode: Support target folders on XCode. 2011-06-07 10:44:27 -04:00
Johan Björk 59ed84e032 Xcode: Support multiple level nesting of XCode folders (#10039) 2011-06-07 10:21:49 -04:00
Johan Björk d0a403fd99 CMake: Move tokenize to cmSystemTools 2011-06-07 10:18:54 -04:00
Bill Hoffman 9d406cdb65 Fix for bug #11927, external project git clone step always runs vs10.
In cmMakefile.cxx GetCMakeCFGInitDirectory is replaced with
GetCMakeFilesDirectory for .rule files.  In some cases with
external projects, that directory will not exist.  With vs10
the .rule files must exist or the rule will run with every build.
This fix creates the path that the .rule file is in.  In addition,
it is now a CMake error if the .rule file can not be created.
2011-06-07 08:59:03 -04:00
KWSys Robot 08b109a87f KWSys Nightly Date Stamp 2011-06-07 00:12:06 -04:00
Brad King 44cdae921d Xcode: Fix parallel build depends with universal binaries (#11844)
A post-build phase of each target invokes the XCODE_DEPEND_HELPER.make
file to erase any targets that link to it.  Narrow the set of targets
tested by each post-build phase to those that depend on the newly
completed target.  This avoids removing files from partially built
unrelated targets that happen to be building in parallel.
2011-06-06 17:44:11 -04:00
Bill Hoffman dd52fc309d Fix a memory leak. 2011-06-06 16:41:17 -04:00
KWSys Robot 4b652ad0d9 KWSys Nightly Date Stamp 2011-06-06 00:13:03 -04:00
KWSys Robot e3aec95740 KWSys Nightly Date Stamp 2011-06-05 00:11:54 -04:00
David Cole 51e16c05f7 BundleUtilities: Avoid test on Watcom dashboards (#12034) 2011-06-04 19:54:49 -04:00
KWSys Robot 43824d44f4 KWSys Nightly Date Stamp 2011-06-04 00:13:05 -04:00
Bill Hoffman 27aa446352 One more try. Use full path by default, and relative on broken compilers. 2011-06-03 16:16:50 -04:00
Bill Hoffman 2dfc121b89 Use bin tree for inclues to avoid -I with spaces in the path. 2011-06-03 15:05:28 -04:00
Bill Hoffman 6d29b4bfe6 Append and do not clobber CMAKE_CXX_FLAGS in the test. 2011-06-03 13:00:05 -04:00
KWSys Robot 597ab43604 KWSys Nightly Date Stamp 2011-06-03 00:13:11 -04:00
David Cole b43af94af1 CMake: eliminate use of cvs in the Release scripts
Set GIT_COMMAND to "git" -- each machine involved in building
the CMake release binaries has the right "git" in the PATH.

Separate the release scripts into two batches so we can build
multiple releases on the same machine, in serial, if necessary.
We currnetly do this with the Windows and Cygwin release
binaries on dash2win64.

Sort the files to be uploaded, so that sorting them by modification
time (file copy / upload time) is equivalent to sorting them
alphabetically.
2011-06-02 14:36:14 -04:00
David Cole 8f0667c113 BundleUtilities: Avoid a cryptic and unhelpful error message
When the path to "resolved_embedded_item" was shorter than
the path to the bundle being fixed up, fixup_bundle would
fail with a cmake error like:

  "string end index: 110 is out of range 0 - 85"

Detect when the path of resolved_embedded_item is too short
to be embedded in the bundle, and report the proper error
message, so the poor developer reading it has a snowball's
chance of actually fixing the issue.
2011-06-02 11:55:09 -04:00
Brad King d72734c74c Merge topic 'file-DOWNLOAD-low-speed-timeout'
faa7ec6 Teach file(DOWNLOAD|UPLOAD) to timeout after inactivity
2011-06-02 11:29:27 -04:00
Brad King 87b8b3c0a0 Merge topic 'XL-Fortran-moddir-issue-12246'
3bb8566 XL: Place Fortran modules with -qmoddir= flag (#12246)
2011-06-02 11:29:22 -04:00
Brad King 170b4e5eae Merge topic 'fix-Xcode-spelling-issue-12231'
a27edd8 Fix XCode -> Xcode typos, notably in man page (#12231)
2011-06-02 11:29:18 -04:00
Brad King e606b6b7db Merge topic 'aix-gcc-2.9-issue-12233'
a4cba0e Fix plugin API for gcc 2.9-aix51-020209 (#12233)
2011-06-02 11:29:15 -04:00
Brad King a5507c3e86 Merge topic 'fix-10740-update-string-docs'
ecdad65 CMake: Update documentation of STRING(SUBSTRING) for length -1 (#10740)
2011-06-02 11:29:13 -04:00