Brad King
cbc5e31f86
Merge topic 'resolve/add-STRING-subcommand-FIND-issue-11795/fix-2828-more-info-in-script-mode'
...
1a8eed1
Merge branch 'add-STRING-subcommand-FIND-issue-11795' into fix-2828-more-info-in-script-mode
006124b
Avoid direct use of std::stringstream
8a8da36
Merge branch 'fix-2828-more-info-in-script-mode' into add-STRING-subcommand-FIND-issue-11795
1462561
Add a string(FIND) sub-command (#11795 )
2011-02-22 14:32:55 -05:00
Brad King
6250c7324f
Merge topic 'fix-2828-more-info-in-script-mode'
...
a58ace6
Fix KWStyle line-too-long complaint (#2828 )
106958c
Add CMAKE_ARGC and CMAKE_ARGV0..N-1 variables (#2828 )
94d1684
Add CMAKE_SCRIPT_MODE_FILE variable (#2828 )
2011-02-22 14:32:48 -05:00
Brad King
6dc8c25226
Merge topic 'fix-11877-sort-tests-correctly'
...
8af8eab
Use stable_sort to preserve test order (#11877 )
2011-02-22 14:32:43 -05:00
Brad King
5239fb0dfe
Merge topic 'CPackRPM-HonorAllComponentWays'
...
0cf1d72
CPackRPM fix IRIX compiler warning (variable never used)
494bb8a
CPackRPM honors all the different ways of packaging components
2011-02-22 14:32:36 -05:00
Brad King
67c542a3cc
Merge topic 'AddCustomTargetSourcesToCodeBlocksProject'
...
2a9f7f9
Also add the SOURCES from add_custom_target() to CodeBlocks projects (#11736 )
2011-02-22 14:32:31 -05:00
Brad King
7dcf2269ec
Merge topic 'FixBadXMLInEclipseProjects'
...
79e13af
Add XML escaping for directory name in Eclipse projects (#11658 )
8074bca
Fix XML escaping for target names in Eclipse project files (#11658 )
cb94587
Fix XML escaping for the project() name in Eclipse projects (#11658 )
2011-02-22 14:32:27 -05:00
Brad King
c5f27110ab
Merge topic 'init-LDFLAGS-issue-11840'
...
3b77516
Fix linker flag initialization from LDFLAGS (#11840 )
2011-02-22 14:32:22 -05:00
Brad King
2d2f79a995
Merge topic 'vs-intel-dll-implib-outdir'
...
2516c05
VS: Create a Fortran DLL's import library directory
2011-02-22 14:32:16 -05:00
Brad King
01b65de3f9
Merge topic 'fix-11717-gcov-same-file-name'
...
6e02a3b
CTest: Use the gcov --preserve-paths flag (#11717 )
2011-02-22 14:32:11 -05:00
Brad King
f556773f01
Merge topic 'fix-11761-less-file-download-noise'
...
667cf5b
Make file DOWNLOAD less noisy (#11761 )
2011-02-22 14:32:01 -05:00
Brad King
cc5bbed52a
Merge topic 'fix-10704-manifest-no-vs10'
...
fbca267
VS: Only use /MANIFEST if hasManifest is true (#11216 )
98b448e
VS2010: Fixed GenerateManifest flag (#10704 )
2011-02-22 14:31:55 -05:00
Brad King
15ff343d23
Merge topic 'fix-4564-make-test-alias'
...
816c9d1
CTest: Add alias for make test target (#4564 )
2011-02-22 14:31:50 -05:00
Brad King
11f55fff8f
Merge topic 'fix-10723-non-dev-xcode'
...
d421a43
Strip trailing space from xcode-select output (#10723 )
2011-02-22 14:31:45 -05:00
Brad King
6e450ed7f0
Merge topic 'mpif77-workaround-o-c-order'
...
93f230e
Pass -o after -c for Fortran to avoid mpif77 ordering bug
2011-02-22 14:31:40 -05:00
Brad King
a38c1b3584
Merge topic 'qtdialog-groupingbug'
...
b1f52b1
Fix grouping bug where "Ungrouped Entries" showed up as a child.
2011-02-22 14:31:31 -05:00
Brad King
554641f320
Merge topic 'fix-8914-allow-config-types-override'
...
e6221ed
Xcode: Allow override of CMAKE_CONFIGURATION_TYPES (#8914 )
2011-02-22 14:31:26 -05:00
Brad King
e0d0e879cf
Merge topic 'fix-10150-mark-timeout-advanced'
...
b5e3692
CTest: Mark DART_TESTING_TIMEOUT as advanced (#10150 )
2011-02-22 14:31:21 -05:00
Brad King
542f45f452
Merge topic 'custom-command-slashes'
...
88548a4
Handle relative WORKING_DIRECTORY in add_custom_(command|target)
7befc00
Handle trailing slashes on add_custom_command DEPENDS
2011-02-22 14:31:12 -05:00
Brad King
45efcc8fa6
Merge topic 'disallow-funny-path-names'
...
8704525
Reject directory names containing '=' (#11689 )
2011-02-22 14:31:07 -05:00
Brad King
64d997a78c
Merge topic 'fix-11295-support-plugin-bundles-on-mac'
...
cabc407
CFBundle Test: Add PATHS for finding Rez (#11295 )
5457b82
Add support for CFBundle targets on the Mac (#11295 )
2011-02-22 14:30:58 -05:00
Brad King
6ec1ae2108
Merge topic 'vs-link-flag-table'
...
85163fb
Add link flag table entries for VS 7,8,9
2011-02-22 14:30:52 -05:00
Brad King
c033ba6769
Merge topic 'fix-10397-add-wchar_t-string-pool-flags'
...
e9425d4
VS7/8/9: Add flag map for string pooling option (#10397 )
ea9de57
VS8/9: Add flag map entries for /Zc:wchar_t (#10397 )
2011-02-22 14:30:48 -05:00
Brad King
52e2c22ee9
Merge topic 'fix-10638-add-enable-prefast-flags'
...
15e4222
VS9: Map enable/disable PREfast flags (#10638 )
2011-02-22 14:30:44 -05:00
Brad King
f866b20880
Merge topic 'fix-10263-add-whole-program-opt-flags'
...
6cf5772
VS7/8/9: Map whole program optimization flags (#10263 )
2011-02-22 14:30:39 -05:00
Brad King
fe07b5eae6
Merge topic 'add-floating-point-flags'
...
d503206
Add FloatingPointModel to the list of known VS7 generator flags.
2011-02-22 14:30:35 -05:00
Brad King
d0b32ca5cd
Merge topic 'fix-clang-warnings'
...
acd8161
ccmake: Remove extra parens around comparison
2011-02-22 14:30:29 -05:00
Brad King
b346093a03
Merge topic 'fix-8154-improve-list-documentation'
...
2d14b15
Clarify list subcommand documentation (#8154 )
2011-02-22 14:30:25 -05:00
Brad King
4d8fee4659
Merge topic 'fix-10446-improve-dash-E-docs'
...
1019d82
Documentation: Sync two differing copies of -E docs (#10446 )
2434d88
Documentation: document platform specific -E commands (#10446 )
2011-02-22 14:30:20 -05:00
Brad King
377ed8e764
Merge topic 'fix-11526-mac-remove-carbon-refs'
...
0037dcb
Removed most usage of Carbon in favour of CoreFoundation
2011-02-22 14:30:12 -05:00
Brad King
37e4b034d4
Merge topic 'eliminate-unnecessary-test-isms'
...
a6a21c8
Tests: Eliminate unnecessary files and variables.
2011-02-22 14:30:05 -05:00
Brad King
70bd240e6c
Merge topic 'increase-ep-test-timeout'
...
42b26ee
ExternalProject Test: Increase test timeout value
2011-02-22 14:29:49 -05:00
KWSys Robot
73bbef36d0
KWSys Nightly Date Stamp
2011-02-22 00:10:58 -05:00
Brad King
6a61a8a538
Honor module .def files with MinGW tools ( #9997 )
...
Since commit 024d05ad
(Fix use of module .def files for MS tools,
2009-09-29) module .def files work for any platform that sets
CMAKE_LINK_DEF_FILE_FLAG correctly. Set it in the Windows-GNU platform
information file to enable support with MinGW tools. Also enable the
test added by commit 0db2c850
(Test use of module .def files for MS
tools, 2009-09-29) for MinGW and MSYS generators.
2011-02-21 14:34:54 -05:00
KWSys Robot
1ca15f85f1
KWSys Nightly Date Stamp
2011-02-21 00:11:05 -05:00
KWSys Robot
dff3d7da3f
KWSys Nightly Date Stamp
2011-02-20 00:12:08 -05:00
Clinton Stimpson
4167be052f
Fix issues with find_path() for QtCore include dir on Mac. Fixes 11868.
2011-02-19 15:30:02 -07:00
KWSys Robot
9e81dddc4f
KWSys Nightly Date Stamp
2011-02-19 00:10:09 -05:00
David Cole
8af8eab7a4
Use stable_sort to preserve test order ( #11877 )
...
Using sort results in a possibly-modified sorting
when all elements are "tied" - use stable_sort instead
to preserve the original ordering of tied elements.
2011-02-18 13:10:26 -05:00
KWSys Robot
16b99e6cae
KWSys Nightly Date Stamp
2011-02-18 00:12:04 -05:00
Brad King
1a8eed171b
Merge branch 'add-STRING-subcommand-FIND-issue-11795' into fix-2828-more-info-in-script-mode
2011-02-17 08:48:08 -05:00
Brad King
006124b446
Avoid direct use of std::stringstream
...
In method cmStringCommand::HandleFindCommand added by parent commit use
the cmOStringStream compatibility wrapper instead of std::stringstream.
2011-02-17 08:44:22 -05:00
KWSys Robot
e0d64d5cb1
KWSys Nightly Date Stamp
2011-02-17 00:12:06 -05:00
KWSys Robot
8caed60208
KWSys Nightly Date Stamp
2011-02-16 00:12:03 -05:00
Eric NOULARD
0cf1d72e3c
CPackRPM fix IRIX compiler warning (variable never used)
2011-02-15 19:55:36 +01:00
Brad King
8a8da3694b
Merge branch 'fix-2828-more-info-in-script-mode' into add-STRING-subcommand-FIND-issue-11795
...
Conflicts:
Tests/CMakeTests/StringTestScript.cmake
2011-02-15 13:48:37 -05:00
Tim Hütz
1462561a8c
Add a string(FIND) sub-command ( #11795 )
2011-02-15 13:17:51 -05:00
David Cole
4d1240eb0a
Begin post-2.8.4 development
2011-02-15 11:45:45 -05:00
David Cole
1bb4c7be11
CMake 2.8.4
2011-02-15 10:31:54 -05:00
David Cole
d5d661d2b2
Merge branch 'release'
2011-02-15 10:27:32 -05:00
Brad King
acd8161bad
ccmake: Remove extra parens around comparison
...
The Clang compiler warns about extra parenthesis in the code
if ((form->curpage == field->page))
~ ^ ~
because the idiom is commonly used when an assignment is intended
instead of a comparison. Remove the extra enclosing layer.
2011-02-15 08:46:50 -05:00