Commit Graph

16207 Commits

Author SHA1 Message Date
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
KWSys Robot d4884710a4 KWSys Nightly Date Stamp 2011-02-15 00:12:12 -05:00
Brad King 6720f97d3b Merge topic 'copyright-FindPerlLibs'
bff5772 FindPerlLibs: Add notice of copyright
2011-02-14 16:34:39 -05:00
Brad King d02519e974 Merge topic 'doc-MSVC_VERSION-issue-11833'
5cdd05b Fix documentation of MSVC_VERSION (#11833)
2011-02-14 16:34:29 -05:00
Brad King 42a5e8d978 Merge topic 'linux-standard-base'
ee55a4f libarchive: Use OpenSSL only if CMAKE_USE_OPENSSL (#11815)
41b7b3e libarchive: Define major/minor/makedev only where needed (#11648)
2011-02-14 16:34:11 -05:00
KWSys Robot 2a2fca24aa KWSys Nightly Date Stamp 2011-02-14 00:10:26 -05:00
Alex Neundorf 2a9f7f96b8 Also add the SOURCES from add_custom_target() to CodeBlocks projects (#11736)
Since CMake 2.6.3 add_custom_target() has a SOURCES option, this was not
yet considered in the C::B generator.
Also, now GENERATED files are not added to the project.

Alex
2011-02-13 22:53:43 +01:00
KWSys Robot d26ef5c118 KWSys Nightly Date Stamp 2011-02-13 00:10:44 -05:00
Alex Neundorf e8a97e075a Eclipse projects: created one linked resource for each subproject
Now a virtual folder "Subprojects" is created, and in this virtual folder
is a linked resource for each project().
This can be considered a fix for #11657

Alex
2011-02-13 01:15:11 +01:00
Alex Neundorf 79e13af195 Add XML escaping for directory name in Eclipse projects (#11658)
Alex
2011-02-12 22:01:27 +01:00
Alex Neundorf 8074bca93c Fix XML escaping for target names in Eclipse project files (#11658)
Alex
2011-02-12 21:54:02 +01:00
Alex Neundorf cb94587a88 Fix XML escaping for the project() name in Eclipse projects (#11658)
Alex
2011-02-12 21:49:08 +01:00
KWSys Robot 84dafee565 KWSys Nightly Date Stamp 2011-02-12 00:10:49 -05:00
Brad King 3b77516862 Fix linker flag initialization from LDFLAGS (#11840)
When initializing CMAKE_(EXE|SHARED|MODULE)_LINKER_FLAGS from LDFLAGS
and CMAKE_(EXE|SHARED|MODULE)_LINKER_FLAGS_INIT quote the whole string
in case both are set.

Reported-by: Daniel R. Gomez <gomez@teragram.com>
2011-02-11 08:54:38 -05:00
KWSys Robot 831c5ebe58 KWSys Nightly Date Stamp 2011-02-11 00:12:06 -05:00
Brad King 2516c05c2c VS: Create a Fortran DLL's import library directory
The Intel Fortran plugin forgets to create the output directory into
which it will write a DLL's import library.  Utilize the fix added by
commit f4b3bdc6 (Create an exe's implib output dir for VS, 2009-06-15)
and generalized by commit 764ac980 (Generalize exe implib dir creation
for VS, 2009-06-16).  Create a pre-link rule to make the directory.
2011-02-10 16:17:44 -05:00