Commit Graph

10951 Commits

Author SHA1 Message Date
KWSys Robot 57eea54720 KWSys Nightly Date Stamp 2010-10-29 00:11:07 -04:00
David Cole 9bf662a92a Merge topic 'fix_ctest_working_dir'
3f94c7c When processing DartMeasurements use the tests working directory.
2010-10-28 15:36:17 -04:00
David Cole 3f3f3e5f54 Merge topic 'CPackDeb-MoreControl'
a749724 CPackDeb Added several optional debian binary package fields
2010-10-28 14:10:23 -04:00
KWSys Robot 70101ee8e7 KWSys Nightly Date Stamp 2010-10-28 00:11:05 -04:00
KWSys Robot 01a90e9622 KWSys Nightly Date Stamp 2010-10-27 00:11:06 -04:00
KWSys Robot 7db02e9b3a KWSys Nightly Date Stamp 2010-10-26 00:11:04 -04:00
Eric NOULARD a749724029 CPackDeb Added several optional debian binary package fields
This fixes bugs #0011355  and 0008342.
The merged patch is a contribution from Michael Lasmanis and Petri Hodju
with some extra documentation added by the merger.
2010-10-25 20:40:45 +02:00
KWSys Robot 06b5eaa3cf KWSys Nightly Date Stamp 2010-10-25 00:11:05 -04:00
KWSys Robot de81f2a4ee KWSys Nightly Date Stamp 2010-10-24 00:11:05 -04:00
KWSys Robot 185582d5fe KWSys Nightly Date Stamp 2010-10-23 00:12:04 -04:00
KWSys Robot 91b5bc3efa KWSys Nightly Date Stamp 2010-10-22 00:10:12 -04:00
KWSys Robot e42160f3e0 KWSys Nightly Date Stamp 2010-10-21 00:11:02 -04:00
KWSys Robot 5bae7f3b19 KWSys Nightly Date Stamp 2010-10-20 00:11:01 -04:00
Bill Hoffman 3f94c7cc39 When processing DartMeasurements use the tests working directory.
Restore CMake 2.6 behavoir where the dart processing apparently was run from within the tests directory instead of the root of the build tree. This addresses issue reported on the VTK Dashboard where the Testing/Temporary directory is defined as ../../../Testing/Temporary but the DartProcessing is run with respect to the root of the build tree. This causes the regression/difference images to not be located by ctest and thus not uploaded to the dashboard.
2010-10-19 16:15:32 -04:00
David Cole 9e6eb7c8b6 Merge topic 'xcode-hh-files'
8f0a70e Xcode: Recognize .hh as C++ (#11307)
2010-10-19 15:53:54 -04:00
David Cole b0fb2ad3e1 Merge topic 'AddCMAKE_CURRENT_LIST_DIR'
b011840 Use absolute path to FindPackageHandleStandardArgs.cmake everywhere
41e4f1a Add automatic variable CMAKE_CURRENT_LIST_DIR(dir of CMAKE_CURRENT_LIST_FILE)
f9fc79c Remove trailing whitespace
2010-10-19 15:53:16 -04:00
KWSys Robot 915e5805d9 KWSys Nightly Date Stamp 2010-10-19 00:10:04 -04:00
KWSys Robot 00b327fed8 KWSys Nightly Date Stamp 2010-10-18 00:11:02 -04:00
KWSys Robot 76c8c6017c KWSys Nightly Date Stamp 2010-10-17 00:10:08 -04:00
KWSys Robot 0dc88cf853 KWSys Nightly Date Stamp 2010-10-16 00:10:08 -04:00
KWSys Robot 57c04db124 KWSys Nightly Date Stamp 2010-10-15 00:10:07 -04:00
Clinton Stimpson 249a9bb44d cmake-gui: use BundleUtilities in place of custom script.
BundleUtilities is better supported and allows including
shared Qt libs on other platforms.  Also removed limitation
of static Qt for windows build of cmake-gui.
2010-10-14 13:58:43 -06:00
KWSys Robot 3dc07529cf KWSys Nightly Date Stamp 2010-10-14 00:10:43 -04:00
KWSys Robot 68e0b6357d KWSys Nightly Date Stamp 2010-10-13 00:10:36 -04:00
David Cole fbecc534d1 Merge topic 'document-bundle-loader'
abb6e75 Document ENABLE_EXPORTS behavior on Mac (#11295)
2010-10-12 11:11:33 -04:00
David Cole 1b98d04e1a Merge topic 'vs10-order-dependencies'
973df7c VS10: Order .vcxproj dependencies deterministically (#10502)
2010-10-12 11:05:57 -04:00
David Cole f78f82ccbf Merge topic 'CodeBlocksGeneratorFixForExternalSubdirs'
9072535 CodeBlocks Generator: Do not omit files in the project file listing.
2010-10-12 11:04:53 -04:00
Brad King 8f0a70e5f0 Xcode: Recognize .hh as C++ (#11307) 2010-10-12 09:06:33 -04:00
KWSys Robot 3810da1a73 KWSys Nightly Date Stamp 2010-10-12 00:10:33 -04:00
Brad King abb6e755eb Document ENABLE_EXPORTS behavior on Mac (#11295)
Mention that it is implemented with -bundle-loader on platforms that
need link-time symbol resolution but that do not use DLL import libs.
2010-10-11 08:35:19 -04:00
KWSys Robot 3138cc503b KWSys Nightly Date Stamp 2010-10-11 00:10:06 -04:00
KWSys Robot c89527a421 KWSys Nightly Date Stamp 2010-10-10 00:10:08 -04:00
KWSys Robot 8af6a13728 KWSys Nightly Date Stamp 2010-10-09 00:10:06 -04:00
KWSys Robot 7119b5f5be KWSys Nightly Date Stamp 2010-10-08 00:10:06 -04:00
Brad King 973df7c0e9 VS10: Order .vcxproj dependencies deterministically (#10502)
This avoids needless modification of the project files during
regeneration.
2010-10-07 09:54:24 -04:00
KWSys Robot e124032654 KWSys Nightly Date Stamp 2010-10-07 00:10:31 -04:00
KWSys Robot 3d0ace69c0 KWSys Nightly Date Stamp 2010-10-06 00:10:25 -04:00
Brad King dacc47853d Merge topic 'vs-project-groups'
fd3249e New USE_FOLDERS property OFF by default. (#3796)
2010-10-05 15:31:49 -04:00
Brad King 51047564bf Merge topic 'vs10-custom-comments'
2596e16 VS10: Encode custom command comments for echo (#11283)
2010-10-05 15:31:03 -04:00
Brad King b653e8b6e7 Merge topic 'dev/test-for-bug-11230'
96a335f XCode generation should fail if lang isn't known
d3a8943 Fix which string is checked for in the test
220c5dc Add test that CMake errors with empty libs
2010-10-05 15:30:10 -04:00
Brad King 54a3bf001c Merge topic 'vs10-empty-target'
448661f VS10: Skip targets with no linker language (#11230)
2010-10-05 15:29:20 -04:00
Brad King 46bc165c36 Merge topic 'fix_custom_commands_with_intdir_vs10'
3d68dd2 Fix for bug #11274, VS10 custom commands that create files in INTDIR fix.
2010-10-05 15:28:45 -04:00
Alex Neundorf 9072535f83 CodeBlocks Generator: Do not omit files in the project file listing.
The CodeBlocks generator used to omit files that were in siblings directories.
Though that filters out a few files that could be argued aren't of interest
to the user, it also potentialy hides files that are relevant to the user.

Patch by Daniel Teske.

Alex

See: http://bugreports.qt.nokia.com/browse/QTCREATORBUG-2250 for an example.
2010-10-05 21:16:17 +02:00
KWSys Robot d0d8f029ab KWSys Nightly Date Stamp 2010-10-05 00:10:31 -04:00
KWSys Robot 5eca3dd0f0 KWSys Nightly Date Stamp 2010-10-04 00:10:06 -04:00
KWSys Robot ef4263aad7 KWSys Nightly Date Stamp 2010-10-03 00:10:04 -04:00
David Cole fd3249e11a New USE_FOLDERS property OFF by default. (#3796)
Visual Studio Express editions do not support solution folders,
so default behavior should be as if USE_FOLDERS global property
is OFF.

Also, allow folder names to be the same as target names: internally,
use a prefix to distinguish folder GUIDs from target GUIDs. Add
a target and folder with the same name in the ExternalProject
test to exercise this code.

For CMake itself, provide a new option CMAKE_USE_FOLDERS that
defaults to ON so that Visual Studio users get a nicely organized
CMake project. Express edition users will have to turn off the
CMAKE_USE_FOLDERS option in order to build CMake in the VS Express
IDE.
2010-10-02 14:31:02 -04:00
KWSys Robot 2488c343f1 KWSys Nightly Date Stamp 2010-10-02 00:10:36 -04:00
Brad King 2596e16c8f VS10: Encode custom command comments for echo (#11283)
VS10 uses MSBuild underneath.  The <Message></Message> CDATA are just
appended to "echo" and executed as a single command.  Encode the message
such that it can be passed to echo.  Convert newlines to tabs since they
cannot be printed this way.
2010-10-01 16:12:00 -04:00
KWSys Robot d69b129481 KWSys Nightly Date Stamp 2010-10-01 00:10:39 -04:00
Ben Boeckel 96a335fd8d XCode generation should fail if lang isn't known 2010-09-30 14:54:20 -04:00
Brad King 448661fbe5 VS10: Skip targets with no linker language (#11230)
In targets with no non-header files the linker language cannot be
determined.  Since the target project file cannot be generated at all in
this case, give up as soon as it is detected.  Otherwise the generation
code may try to run with uninitialized information.
2010-09-30 08:48:38 -04:00
KWSys Robot 4e137de7b1 KWSys Nightly Date Stamp 2010-09-30 00:10:39 -04:00
Bill Hoffman 3d68dd230d Fix for bug #11274, VS10 custom commands that create files in INTDIR fix. 2010-09-29 17:02:04 -04:00
Brad King a2bbe4bef9 Remove trailing whitespace from Xcode generator source
Reverting abandoned topic xcode_source_group_fix_7932 left this source
slightly different due to trailing whitespace removal on some lines.
Remove all trailing whitespace from the file to make it consistent.
2010-09-29 08:38:18 -04:00
KWSys Robot 0f6b3a0059 KWSys Nightly Date Stamp 2010-09-29 00:10:08 -04:00
Alex Neundorf 41e4f1a210 Add automatic variable CMAKE_CURRENT_LIST_DIR(dir of CMAKE_CURRENT_LIST_FILE)
Comes with a simple test and docs.

Alex
2010-09-28 22:10:47 +02:00
Alex Neundorf f9fc79cac5 Remove trailing whitespace
Alex
2010-09-28 21:44:22 +02:00
Brad King d24b8acc1a Merge topic 'cmake-guiRememberAdvancedCheckbox'
3d13502 Make cmake-gui remember whether the "Advanced" checkbox was checked or not
8e8acb7 -remove trailing whitespace
2010-09-28 14:06:31 -04:00
Brad King 3398ec7d6f Merge topic 'vs10-object-intdir'
7ef659f VS10: Use $(IntDir) for per-source output directory (#11270)
2010-09-28 14:04:48 -04:00
Brad King 126158f046 Merge topic 'fixAbsoluteDestHandlingRegression'
225abc5 InstallGen/CPack  fix handling absolute installed file regression
2010-09-28 14:02:44 -04:00
KWSys Robot 5efe30791b KWSys Nightly Date Stamp 2010-09-28 00:10:03 -04:00
Brad King 7ef659fcc3 VS10: Use $(IntDir) for per-source output directory (#11270)
The original implementation of this generator accidentally used
"$(Configuration)/" for source-specific object file names.  Correct it
to use "$(IntDir)/" just like the generators for all previous VS
versions.  The target-wide output directory is "$(IntDir)/" already.
2010-09-27 08:37:00 -04:00
KWSys Robot 993cfc9406 KWSys Nightly Date Stamp 2010-09-27 00:10:04 -04:00
KWSys Robot c928751d27 KWSys Nightly Date Stamp 2010-09-26 00:10:04 -04:00
KWSys Robot f42bae0bd5 KWSys Nightly Date Stamp 2010-09-25 00:10:04 -04:00
KWSys Robot 7d243b9695 KWSys Nightly Date Stamp 2010-09-24 00:10:36 -04:00
Alex Neundorf 3d13502c98 Make cmake-gui remember whether the "Advanced" checkbox was checked or not
Alex
2010-09-23 21:48:07 +02:00
Alex Neundorf 8e8acb7aab -remove trailing whitespace
Alex
2010-09-23 21:47:06 +02:00
KWSys Robot a9bf98b2a6 KWSys Nightly Date Stamp 2010-09-23 00:10:11 -04:00
Brad King dda5bbd7c9 Merge topic 'fix_windows7_untar'
775697d Add a delay after untar on windows to make external project work on windows 7
2010-09-22 13:53:25 -04:00
Brad King 14d5ea7438 Merge topic 'mingw-long-object-lists'
5f05a3c MinGW: Support long object file lists
2d9bb33 Evaluate <OBJECT_DIR> rule variable for executables
2010-09-22 13:52:24 -04:00
KWSys Robot d65a91dd45 KWSys Nightly Date Stamp 2010-09-22 00:10:27 -04:00
Brad King 781c34197b Merge topic 'fix-9963'
a798bb7 Avoid CustomCommand test failure on VS71 (#9963)
9b4ab06 Avoid CustomCommand test failure on VS71 (#9963)
9d2e648 No extra spaces in CustomCommand test (#9963)
269a4b8 Enable calling commands with : in argv[1] (#9963)
2010-09-21 10:44:08 -04:00
Brad King 5968785b2f Merge topic 'xcode-ARCHS-quoting'
a8ded53 Xcode: Quote string values containing '$' (#11244)
0790af3 Xcode: Avoid trailing space in ARCHS list (#11244)
2010-09-21 10:42:50 -04:00
Brad King 724804600b Merge topic 'document-IMPORTED_NO_SONAME'
8f96818 Document IMPORTED_NO_SONAME target property
2010-09-21 10:37:59 -04:00
Brad King 9da64e7c6b Merge topic 'fix-ccmake-search'
5d7c3c0 ccmake: Fix search with '/'
2010-09-21 10:33:08 -04:00
Brad King 753cbf8356 Merge topic 'fix_line_length_issues'
3901174 Fix KWStyle line length issues.
2010-09-21 10:32:18 -04:00
Bill Hoffman 775697d5f5 Add a delay after untar on windows to make external project work on windows 7
OK, on windows 7 after we untar some files,
sometimes we can not rename the directory after
the untar is done. This breaks the external project
untar and rename code.  So, by default we will wait
1/10th of a second after the untar.  If CMAKE_UNTAR_DELAY
is set in the env, its value will be used instead of 100.
2010-09-21 10:04:04 -04:00
KWSys Robot 950b735101 KWSys Nightly Date Stamp 2010-09-21 00:10:07 -04:00
Eric NOULARD 225abc555d InstallGen/CPack fix handling absolute installed file regression 2010-09-20 23:33:35 +02:00
Mikkel Krautz a8ded5338b Xcode: Quote string values containing '$' (#11244)
Allow use of $(STANDARD_32BIT_ARCHS) as CMAKE_OSX_ARCHITECTURES.
The expanded value must remain a single string.
2010-09-20 10:08:40 -04:00
Mikkel Krautz 0790af3bf5 Xcode: Avoid trailing space in ARCHS list (#11244)
With CMAKE_OSX_ARCHITECTURE settings such as $(ARCHS_STANDARD_32BIT),
the space inserted by the for loop would confuse Xcode if quoted. In
this particular example, what would be output would be:

  ARCHS = "$(ARCHS_STANDARD_32BIT) ";

The Xcode UI does not recognize this as the built-in "Standards 32-bit"
architecture setting unless the space is removed.
2010-09-20 10:05:33 -04:00
KWSys Robot b03087798b KWSys Nightly Date Stamp 2010-09-20 00:10:05 -04:00
KWSys Robot d10b94b2f0 KWSys Nightly Date Stamp 2010-09-19 00:10:03 -04:00
KWSys Robot c30c3ade9b KWSys Nightly Date Stamp 2010-09-18 00:10:05 -04:00
Brad King 8f96818a5c Document IMPORTED_NO_SONAME target property
Commit fd37a6ec (Better linker search path computation, 2008-02-21)
added this property but did not document it.  Add the documentation.
2010-09-17 13:28:29 -04:00
KWSys Robot 4b682e13fb KWSys Nightly Date Stamp 2010-09-17 00:10:04 -04:00
Brad King 5d7c3c0a59 ccmake: Fix search with '/'
Commit 7a18dd8e (Add searching of variables, 2003-03-07) added method
cmCursesMainForm::JumpToCacheEntry to search for cache entries whose
names match a given search string.  The method also had a useless
argument "int idx" probably left from earlier development iterations and
hard-coded in all calls to the value '-1'.  The method compared this
argument to the "NumberOfVisibleEntries" member which at the time was of
type "int" also.

Commit ff1f8d0b (Fix or cast more integer conversions in cmake,
2010-06-29) changed the type of "NumberOfVisibleEntries" to size_t to
fix other integer conversion warnings.  An unsigned type makes sense
given the purpose of the member.  However, this caused the '-1' signed
value to be converted to a large unsigned value in the above-mentioned
comparison, leading to incorrect behavior.

Fix the problem by removing the useless argument and the comparison.
2010-09-16 17:45:27 -04:00
Brad King 2d9bb3325f Evaluate <OBJECT_DIR> rule variable for executables
Previously this placeholder was evaluated only for libraries.  Make it
work for executables too.
2010-09-16 15:07:41 -04:00
KWSys Robot 48a126717c KWSys Nightly Date Stamp 2010-09-16 00:10:04 -04:00
Bill Hoffman 390117435a Fix KWStyle line length issues. 2010-09-15 16:41:41 -04:00
KWSys Robot de7a090847 KWSys Nightly Date Stamp 2010-09-15 00:10:05 -04:00
Brad King 4c06e23307 Merge topic 'resolve/fix_target_name_with_dot_vs10/allow_upper_case_cpp_and_others'
eccc7d5 Merge branch 'allow_upper_case_cpp_and_others' into resolve/fix_target_name_with_dot_vs10/allow_upper_case_cpp_and_others
ed37fc3 VS2010: Set IntDir for utility and global targets.
e79e412 VS2010: Honor PROJECT_LABEL target property (#10611)
530ade6 Fix targets with . in the name for VS 10 IDE.
2010-09-14 15:07:23 -04:00
Brad King 6580f5de99 Merge topic 'improve-missing-source-file-error'
a6b5ead Report missing source files with context of target
2010-09-14 13:31:10 -04:00
Brad King f306a357b2 Merge topic 'style-line-length'
9d21281 Fix line-too-long style errors
86025d3 file(DOWNLOAD): Fix error message formatting
2010-09-14 13:19:53 -04:00
Brad King 5233d34c31 Merge topic 'preserve-timestamps-on-tar-extract'
666f328 Preserve timestamps on files on tar extract.
2010-09-14 13:11:06 -04:00
Brad King 5dfa48c8c5 Merge topic 'lazy-query-cdash'
ffda17d We shouldn't ask CDash for its version info until/unless we actually need it.
2010-09-14 13:09:58 -04:00
Brad King 1ae9832988 Merge topic 'multi-v-single-configuration'
b06fb16 No CMAKE_CONFIGURATION_TYPES in single-config generators (#10202)
2010-09-14 13:07:59 -04:00
KWSys Robot becc11f72f KWSys Nightly Date Stamp 2010-09-14 00:10:28 -04:00