Commit Graph

12418 Commits

Author SHA1 Message Date
KWSys Robot 405bcd8def KWSys Nightly Date Stamp 2011-09-03 00:14:08 -04:00
Thomas Jarosch d1751fbf17 ccmake: Fix off-by-one memory access error
Credit goes to "cppcheck".

Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
2011-09-02 11:15:40 -04:00
Thomas Jarosch 4868921bc2 Fix file() command descriptor leak on error
Credit goes to "cppcheck".

Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
2011-09-02 11:15:26 -04:00
Thomas Jarosch f47393c66b CTest: Fix memory leaks on error
Credit goes to "cppcheck".

Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
2011-09-02 11:15:11 -04:00
KWSys Robot 83ce7c4d3c KWSys Nightly Date Stamp 2011-09-02 00:13:05 -04:00
David Cole 925af96eda Merge topic 'fix-xcode4-test-failures'
0cf4fa5 Xcode4: Requires more quoting of single quote char
2011-09-01 15:12:31 -04:00
David Cole 319df3245e Merge topic 'AutomocForQt'
7bf2c1a Create moc files in the current binary dir, not the top level.
2011-09-01 15:11:55 -04:00
Brad King 90efed6ee6 Xcode: Honor Fortran_FORMAT target and source file property
Convert the target property to the IFORT_LANG_SRCFMT build setting.
Convert the source property to the per-source COMPILER_FLAGS setting.
2011-09-01 10:54:12 -04:00
Johan Bjork 57bc42ae91 Xcode: Do not emit the ZERO_CHECK target more than once 2011-09-01 09:59:44 -04:00
David Cole 0c28b48d9b CMake: Add SaveCache at the end of successful Generate calls
Without this call, recent refactoring changes in the Visual
Studio generators yield no GUIDs saved in the cache. Putting
the SaveCache here *once* avoids scattering many calls to it
in specific generators.
2011-09-01 08:49:00 -04:00
Brad King 89f420abde KWSys: Fix std::string hash function for Borland
Borland ignores "const" qualifiers in template specializations.
2011-09-01 08:22:03 -04:00
Brad King 8e6352f8db KWSys: Add hash function for std::string
Added hashing fuction for std::string.  This adds default support for
std::strings to KWSys hashing containers.

Author: Bradley Lowekamp <blowekamp@mail.nih.gov>
Suggested-by: Arnaud Gelas <arnaud_gelas@hms.harvard.edu>
Change-Id: I7e7a0c356b73d19868a3df1db57b702ec7fffe9d
2011-09-01 08:10:20 -04:00
KWSys Robot 917ca9f142 KWSys Nightly Date Stamp 2011-09-01 00:14:06 -04:00
Brad King 5c0c635a09 Fortran: Add support for free- and fixed-form flags
Define a "Fortran_FORMAT" target and source file property.  Initialize
the target property from a "CMAKE_Fortran_FORMAT" variable.  Interpret
values "FIXED" and "FREE" to indicate the source file format.  Append
corresponding flags to the compiler command line.
2011-08-31 10:24:43 -04:00
Brad King 47a0c7542b VS: Map Fortran free- and fixed-format flags to IDE options
Add Intel Fortran flags "-free" and "-fixed" to the table so they appear
in the IDE correctly.
2011-08-31 09:57:26 -04:00
Brad King d6e2a063f0 VS: Map per-source Fortran flags to IDE options
Fix the VS generator per-source flag parsing to use the Fortran flag map
for Fortran sources.
2011-08-31 09:56:29 -04:00
KWSys Robot a486c837c8 KWSys Nightly Date Stamp 2011-08-31 00:12:35 -04:00
KWSys Robot 51beb446c2 KWSys Nightly Date Stamp 2011-08-30 00:14:06 -04:00
KWSys Robot b17a6dd55b KWSys Nightly Date Stamp 2011-08-29 00:14:06 -04:00
KWSys Robot 195ac0aac1 KWSys Nightly Date Stamp 2011-08-28 00:14:18 -04:00
KWSys Robot 0f78d92c0f KWSys Nightly Date Stamp 2011-08-27 00:15:02 -04:00
KWSys Robot 8508a6986a KWSys Nightly Date Stamp 2011-08-26 00:14:07 -04:00
David Cole 0cf4fa578a Xcode4: Requires more quoting of single quote char
Specifically in per-target and per-file compiler definition
string values.

The Preprocessor test now passes on Xcode 4 builds after
this commit.
2011-08-25 18:39:21 -04:00
David Cole 9d8b025b5f Merge topic 'fix-11690-preserve-xcode-objectids'
1834f23 Xcode: Save object id values in CMakeCache.txt (#11690)
2011-08-25 15:41:13 -04:00
David Cole 7b0cf28ccf Merge topic 'fix_nmake_var_plus'
281f51e Fix for bug #12413, nmake did not handle targets with + in the name.
2011-08-25 15:41:02 -04:00
David Cole 28cba226b3 Merge topic 'UsingCMakeLikePkgConfig2'
59238dc Fix --find-package mode on Cygwin, where enable_language(RC) is called
98472e4 Require the current cmake version in --find-package mode
a6ccf3c Use $(CXXFLAGS) and $(LDFLAGS) in the --find-package test Makefile
4386918 Fix line length
7d69310 Only enable the test when using GNU make
3011149 Make the test harder by always having a space in the include dirs
ab57ff6 Make the --find-package test harder
626fc71 Much improved test, should now be executed on all UNIXes
ec6982d Disable any STATUS output in --find-package mode
e552ae7 Dont check for -isysroot and -mmacosx-version on OSX in --find-package mode
e589589 Rename helper macros print_compile_flags() to set_compile_flags_var()
aecfc1f Fix test on OpenBSD with BSD make
6bb4ca3 The makefile for the test was kindof wrong
fd15b5e Only run the test if we are using a makefile generator under UNIX
9fc87c6 Add a test for the new --find-package mode
d3ae0ff Improve documentation for --find-package mode
bf07375 Add a cmake.m4 for using cmake in autoconf projects instead of pkgconfig
b0e3578 Use the file-utility to test for 64bit if there is no /usr/lib64
53edfb2 Better support for lib64 and Debian multiarch
b8fdaa1 Fix copyright notice in new CMakeFindPackageMode.cmake
7690edf Replace cmake::GetScriptMode() with GetWorkingMode()
e4f603b Implement find-package mode of cmake
a91d662 Add find-package mode, which does nothing yet
b976e70 Make clLocalGenerator::GetTargetFlags() public
2011-08-25 15:40:49 -04:00
David Cole 39f0fa725e Merge topic 'AutomocForQt'
920a046 QtAutomoc: Eliminate compiler warning
b00463f QtAutomoc test: Pass QT_QMAKE_EXECUTABLE
e78ce44 Fix automoc with VS builds: apply patch from Bill
71165e9 Silence warning in automoc: use long instead of int
1879bcc Fix build: use std::ios::out|ios::trunc instead of std::ios_base::out
678e124 Only enable the automoc test after checking that Qt4 works
71c29d1 Fix bootstrap test with automoc
afb3edc Fix warnings
add30e9 Fix build: non-void function must return a value
7e6d845 Automoc.cmake is not needed anymore
2963d0b Fix logic which decides when to execute automoc test
77a5c6e Add documentation for AUTOMOC, add initialization via CMAKE_AUTOMOC
bf8ef77 Add a test for automoc
d045fd4 Nicer progress message for the automoc target
50cd6ce Move automoc processing from add_executable/library to cmGlobalGenerator
cbaac2a Remove trailing whitespace
c27607b Refactor SetupAutomocTarget() so it can be run after creating the target
24d9b7d Remove trailing whitespace
58b7fe6 Use cout instead of printf()
72caf4d Add the generated automoc.cpp file to the cleaned files
ddb517d Color output when running moc
9303295 Initialize verbose based onb the env.var.
ace1215 Move code for parsing a cpp-file from the big loop to separate function
735a5bb Fix line lengths
83b730c Add AUTOMOC to the add_library() command
126c6ea Add the cmake module required currently for automoc
de91feb Remove the need to check for .h/.cxx during buildtime
d65689a Add actual automoc code from automoc
d1c0a5f Start implementing skeleton for automoc in cmake
a65011b Start work on automoc: add empty cmQtAutomoc class
2011-08-25 15:40:29 -04:00
David Cole 50b64fb012 Merge topic 'xcode4-remove-PREBINDING'
bda4148 Xcode: Remove PREBINDING attribute for Xcode 4 and above
2011-08-25 15:40:21 -04:00
David Cole 68b3795140 Merge topic 'fix-vs10-rebuild-issue'
eb02acb VS10: Avoid unnecessary rebuilds for custom commands
2011-08-25 15:40:12 -04:00
Stephen Kelly 7bf2c1aa3e Create moc files in the current binary dir, not the top level. 2011-08-25 21:39:51 +02:00
KWSys Robot e8d60d46d1 KWSys Nightly Date Stamp 2011-08-25 00:10:16 -04:00
David Cole 1834f232a7 Xcode: Save object id values in CMakeCache.txt (#11690)
For project and target objects, save their ids in CMakeCache.txt.

Hopefully, that will be enough to allow user settings to be saved
across multiple CMake generate operations. Other object types may
also need their ids saved: if so, more code than this commit
will be necessary...
2011-08-24 18:11:32 -04:00
Bill Hoffman 281f51e063 Fix for bug #12413, nmake did not handle targets with + in the name.
If you had a + in the name of a target with nmake, it created a variable
in the makefile that used + in its name, which is not allowed by nmake.
To make the implementation easier, + is now not allowed for any make
generators as part of a variable name.
2011-08-24 16:08:31 -04:00
KWSys Robot ee45a5dd5a KWSys Nightly Date Stamp 2011-08-24 00:14:07 -04:00
KWSys Robot fe46e7e486 KWSys Nightly Date Stamp 2011-08-23 00:14:21 -04:00
KWSys Robot 29b285c6a1 KWSys Nightly Date Stamp 2011-08-22 00:12:50 -04:00
KWSys Robot 3848b397ef KWSys Nightly Date Stamp 2011-08-21 00:12:36 -04:00
David Cole 7dcbb66315 KWSys: Remove translation path for "/tmp_mnt/" (#10595)
In SystemTools::ClassInitialize, remove call to AddTranslationPath
that was originally put in place to "work around an SGI problem."
This code precluded using CMake effectively in valid directories
under "/tmp_mnt/"
2011-08-20 12:30:09 -04:00
KWSys Robot 02e2f3e350 KWSys Nightly Date Stamp 2011-08-20 00:13:07 -04:00
David Cole 920a046015 QtAutomoc: Eliminate compiler warning 2011-08-19 14:18:11 -04:00
Johan Bjork bda4148a57 Xcode: Remove PREBINDING attribute for Xcode 4 and above
PREBINDING is obsolete in Xcode 4 and causes warnings if present.
Do not emit it for Xcode >= 4.0
2011-08-19 11:27:26 -04:00
KWSys Robot 8971c0d8d2 KWSys Nightly Date Stamp 2011-08-19 00:14:02 -04:00
David Cole eb02acb695 VS10: Avoid unnecessary rebuilds for custom commands
Thanks to James Bigler for pointing this out on the
cmake-developers mailing list...
2011-08-18 16:51:52 -04:00
Alex Neundorf e78ce44b35 Fix automoc with VS builds: apply patch from Bill
This patch moves the creation of VS GUIDs from the final pass
to AddHelperCommands() and should fix the failing automoc tests
with VS.

Alex
2011-08-18 19:35:41 +02:00
Alex Neundorf 71165e943e Silence warning in automoc: use long instead of int
Alex
2011-08-18 19:34:49 +02:00
Alex Neundorf 1879bcc09c Fix build: use std::ios::out|ios::trunc instead of std::ios_base::out
Alex
2011-08-18 18:53:14 +02:00
Alex Neundorf 43869188af Fix line length
Alex
2011-08-18 18:39:05 +02:00
KWSys Robot d7184e0e4d KWSys Nightly Date Stamp 2011-08-18 00:13:09 -04:00
Alex Neundorf 71c29d11b3 Fix bootstrap test with automoc
Alex
2011-08-17 17:08:50 +02:00
KWSys Robot 721133dc45 KWSys Nightly Date Stamp 2011-08-17 00:10:16 -04:00
Alex Neundorf afb3edc181 Fix warnings
Alex
2011-08-17 00:49:12 +02:00
Alex Neundorf add30e9008 Fix build: non-void function must return a value
Alex
2011-08-17 00:39:21 +02:00
David Cole 7b044105ce Merge topic 'add-vs9-midl-inc-dirs'
ac22e2a VS9: Add include_directories to midl command lines
2011-08-16 17:03:15 -04:00
David Cole 674be27a7f Merge topic 'WriteConfigVersionFile_2TemplateFiles'
c9761de Improve documentation for WriteBasicConfigVersionFile.cmake
208bb90 Set UNSUITABLE instead of not COMPATIBLE
bb03c2d Really fix copyright notice
d50a61a Fix copyright notice
4ba09bc Add some tests for write_basic_config_version_file()
02b1e4b Add example to documentation
d216a67 Provide macro write_basic_config_version_file()
2011-08-16 17:03:00 -04:00
David Cole 47a8d4f22c Merge topic 'fix-10941-correct-comments'
edcdfea Documentation: Fix comments in the source code (#10941)
2011-08-16 17:02:52 -04:00
David Cole b38bf726f4 Merge topic 'enable-parallel-xcode-builds'
312d68d Xcode: Rearrange CMakeReRun to enable parallel builds
2011-08-16 17:02:48 -04:00
David Cole 522c263d9d Merge topic 'fix-imported-target-depend-crash'
8ee9bbb Do not crash when an imported target depends on a missing target
2011-08-16 17:02:43 -04:00
David Cole e1d4a73be0 Merge topic 'fix-12259-quote-commas-for-xcode'
d87eb35 Xcode: Quote ',' in Xcode string values (#12259)
2011-08-16 17:02:38 -04:00
David Cole 0923610b6d Merge topic 'fix-11746-sort-failed-tests-output'
4575ed9 Fix line too long style violation
ba4886b CTest: print failed tests in index order (#11746)
2011-08-16 17:02:23 -04:00
David Cole a772f21a7d Merge topic 'intel_fortran_vs2010'
3c53fbb Fix custom commands in VS2010 Fortran projects using CFG_INTDIR and test.
2011-08-16 17:01:33 -04:00
David Cole 6d5819ca6c Merge topic 'fix-8707-add-vs-globals'
37d8602 Merge topic 'intel_fortran_vs2010' into fix-8707-add-vs-globals
6c72d25 Initial support for Intel Fortran VS2010.
2011-08-16 17:01:28 -04:00
Alex Neundorf 77a5c6e0d8 Add documentation for AUTOMOC, add initialization via CMAKE_AUTOMOC
Alex
2011-08-16 22:05:33 +02:00
KWSys Robot 2bfd55a7c6 KWSys Nightly Date Stamp 2011-08-16 00:14:06 -04:00
Alex Neundorf d045fd4ec5 Nicer progress message for the automoc target
Alex
2011-08-16 02:00:36 +02:00
Alex Neundorf 50cd6cef92 Move automoc processing from add_executable/library to cmGlobalGenerator
Now automoc is enabled by setting the AUTOMOC target property to true,
instead of using the AUTOMOC keyword in add_executable() or add_library()

Alex
2011-08-16 01:45:05 +02:00
Alex Neundorf cbaac2a587 Remove trailing whitespace
Alex
2011-08-16 01:44:13 +02:00
Alex Neundorf c27607baf8 Refactor SetupAutomocTarget() so it can be run after creating the target
This makes it easier to move it from InitialPass() to some other
location, e.g. FinalPass() or something else.

Alex
2011-08-16 01:27:30 +02:00
Alex Neundorf 24d9b7d745 Remove trailing whitespace
Alex
2011-08-16 01:26:02 +02:00
Alex Neundorf ec6982dc8c Disable any STATUS output in --find-package mode
Any STATUS output will be fed directly to the compiler, which
will not understand any status messages. Error messages
are fine, since they are errors and it is ok if the compiler
fails in such cases.

Alex
2011-08-16 00:40:59 +02:00
KWSys Robot 87fa807fd8 KWSys Nightly Date Stamp 2011-08-15 00:13:05 -04:00
Alex Neundorf 58b7fe6545 Use cout instead of printf()
Alex
2011-08-14 17:17:01 +02:00
Alex Neundorf 72caf4d178 Add the generated automoc.cpp file to the cleaned files
Alex
2011-08-14 17:06:34 +02:00
Alex Neundorf ddb517d014 Color output when running moc
Alex
2011-08-14 16:43:04 +02:00
Alex Neundorf 93032953af Initialize verbose based onb the env.var.
Alex
2011-08-14 15:58:09 +02:00
Alex Neundorf ace121534d Move code for parsing a cpp-file from the big loop to separate function
Alex
2011-08-14 15:58:09 +02:00
Alex Neundorf 735a5bb321 Fix line lengths
Alex
2011-08-14 15:58:09 +02:00
Alex Neundorf 83b730cd1a Add AUTOMOC to the add_library() command
Alex
2011-08-14 15:58:08 +02:00
Alex Neundorf 126c6ead77 Add the cmake module required currently for automoc
Alex
2011-08-14 15:58:00 +02:00
Alex Neundorf de91feb367 Remove the need to check for .h/.cxx during buildtime
Instead it now relies on cmake time to put that information
correctly into AutomocInfo.cmake

Alex
2011-08-14 15:53:50 +02:00
Alex Neundorf d65689a3bd Add actual automoc code from automoc
It already works :-)
Needs more refactoring, e.g. using the cmake facilities to turn a string
into a vector etc.
Also still missing is the part which creates the custom target.

Alex
2011-08-14 15:53:38 +02:00
Alex Neundorf d1c0a5fce6 Start implementing skeleton for automoc in cmake
Alex
2011-08-14 15:45:13 +02:00
KWSys Robot 0ee93a81cd KWSys Nightly Date Stamp 2011-08-14 00:12:36 -04:00
KWSys Robot 27c8b8b455 KWSys Nightly Date Stamp 2011-08-13 00:13:07 -04:00
David Cole ac22e2a879 VS9: Add include_directories to midl command lines
Makes VS 7, 8 and 9 generators consistent with the VS 10
generator. Adds the "AdditionalIncludeDirectories" attribute
at the vcproj level so that all idl files inherit the /I
command line args.
2011-08-12 17:12:08 -04:00
KWSys Robot 65ba6da576 KWSys Nightly Date Stamp 2011-08-12 00:14:04 -04:00
Alex Neundorf d3ae0fff7d Improve documentation for --find-package mode
Alex
2011-08-11 22:43:45 +02:00
KWSys Robot 975ef3ef1a KWSys Nightly Date Stamp 2011-08-11 00:14:04 -04:00
KWSys Robot 563e3f0e0a KWSys Nightly Date Stamp 2011-08-10 00:14:02 -04:00
Brad King c04613a55d KWSys: __int64 and long long may be same type in specialization
For the specialization of hash<>(), the types long long and __int64
may be the same type. While the CMakeLists indicate that if __int64 is
a alias for another type the it will not be enabled, on mingw they
both appear to be the same type and enabled.

This patch only enable specialization for long long OR __int64 to
avoid the potential conflict.

Author: Bradley Lowekamp <blowekamp@mail.nih.gov>
Change-Id: I813a9ac008b296fab5a369c48e6dd5460fd0c035
2011-08-09 18:04:04 -04:00
Alex Neundorf 7690edffd9 Replace cmake::GetScriptMode() with GetWorkingMode()
GetWorkingMode() returns a new enum WorkingMode, which is one of
NORMAL_MODE, SCRIPT_MODE and FIND_PACKAGE_MODE.

Alex
2011-08-09 16:32:45 +02:00
KWSys Robot 4675f5d204 KWSys Nightly Date Stamp 2011-08-09 00:13:06 -04:00
Brad King 867c3dcd24 KWSys: Fix using long long and __int64 with hash_(set|map)
Added hash function for types long long and __int64, conditional on
detection by FundamentalType.

Author: Bradley Lowekamp <blowekamp@mail.nih.gov>
Change-Id: Ie273f55cd4387ca3dbbe00b9d96ad4935e456c9e
2011-08-08 08:50:07 -04:00
KWSys Robot 0e28009184 KWSys Nightly Date Stamp 2011-08-08 00:13:08 -04:00
Alex Neundorf a65011baf1 Start work on automoc: add empty cmQtAutomoc class
Alex
2011-08-07 12:02:46 +02:00
KWSys Robot 2c14a176bb KWSys Nightly Date Stamp 2011-08-07 00:14:22 -04:00
KWSys Robot 955d5133ab KWSys Nightly Date Stamp 2011-08-06 00:14:05 -04:00
KWSys Robot ec4e4ce695 KWSys Nightly Date Stamp 2011-08-05 00:13:08 -04:00
David Cole edcdfeae93 Documentation: Fix comments in the source code (#10941)
Previously, the comments had all been copied and pasted
and not fixed up... Now they are fixed up.
2011-08-04 19:03:24 -04:00
Johan Björk 312d68d5b1 Xcode: Rearrange CMakeReRun to enable parallel builds
by isolating the CMakeReRun steps to a ZERO_CHECK target, as
in the Visual Studio generators. Also, honor the value of
CMAKE_SUPPRESS_REGENERATION.
2011-08-04 16:31:45 -04:00
Brad King 8ee9bbbd0c Do not crash when an imported target depends on a missing target
Commit e01cce28 (Allow add_dependencies() on imported targets,
2010-11-19) forgot to check if the dependee exists before using it.
2011-08-04 15:36:32 -04:00
Johan Björk d87eb350f6 Xcode: Quote ',' in Xcode string values (#12259) 2011-08-04 13:03:44 -04:00
Brad King 5f0eba49f2 KWSys: Avoid conversion warning in SystemTools::GetTime
Convert struct timeval members to double explicitly to avoid a GCC
warning with -Wconversion.
2011-08-04 08:30:05 -04:00
KWSys Robot f31def8c62 KWSys Nightly Date Stamp 2011-08-04 00:10:14 -04:00
Bill Hoffman 3c53fbb1f0 Fix custom commands in VS2010 Fortran projects using CFG_INTDIR and test.
For custom commands in VS2010 Fortran projects the INTDIR variable
is different than in the rest of the solution because Intel
fortran still uses the old VS project files even in VS2010. So,
we replace $(Configuration) directly in the project files. I have also
added a FortranOnly test that tests this feature and is run on any
generator that has Fortran abilities.
2011-08-03 17:24:43 -04:00
Brad King 74e1156bc2 KWSys: Simplify SystemTools::GetTime implementation (#12261)
We already use GetSystemTimeAsFileTime() and gettimeofday()
unconditionally on supported Windows and non-Windows platforms,
respectively.  Remove outdated portability complexity.
2011-08-03 14:50:04 -04:00
David Cole 4575ed9e2a Fix line too long style violation 2011-08-03 11:37:59 -04:00
David Cole ba4886b717 CTest: print failed tests in index order (#11746)
This deterministic ordering makes it easier for a developer
comparing the ctest output of two test runs to see what changed
from run to run.

Thanks to Fraser Hutchison for the patch.
2011-08-03 10:48:43 -04:00
KWSys Robot 14e54c4c44 KWSys Nightly Date Stamp 2011-08-03 00:14:04 -04:00
David Cole 80ef23d83f Merge topic 'CodeBlocksIncludeDirsAndDefines'
e2e8c0a Also put builtin include dirs into CodeBlocks project file
92c0dc5 Remove useless line of code
a5683f8 Patch by Campbell Barton: puts definitions into C::B project file
2011-08-02 15:11:58 -04:00
David Cole 11ca173731 Merge topic 'doc-WIN32-cygwin'
1f641de Documentation: WIN32 not defined on Cygwin (#12334)
2011-08-02 15:11:20 -04:00
David Cole e9a6d86d91 Merge topic 'ExcludeCMakesFilesFromCodeBlocksProject'
f32f6f0 Don't put files from CMAKE_ROOT into CodeBlocks projects (#12110)
2011-08-02 15:11:01 -04:00
David Cole ab24bdeecc Merge topic 'cpack-nsis-multi-installs'
e6d2bcf CPack/NSIS: Fix reinstall and multiple install issues when using components.
2011-08-02 15:10:47 -04:00
David Cole abc8586716 Merge topic 'fix-12299-add-vs10-scc-support'
05ddfbf VS10: Add SCC support
2011-08-02 15:10:31 -04:00
David Cole 86bae62bd1 Merge topic 'fix-8707-add-vs-globals'
df95772 Add support for Visual Studio project-specific globals (#8707)
2011-08-02 15:10:09 -04:00
David Cole 2444d6f55e Merge topic 'split-stdout-stderr'
a343bc1 RunSingleCommand: Avoid assignment in condition
642f100 RunSingleCommand: Add a OUTPUT_NORMAL flag.
856a9e4 RunSingleCommand: Replace verbose boolean with enum
4096066 RunSingleCommand: Fix indentation
2011-08-02 15:09:57 -04:00
David Cole 39faba7e30 Merge topic 'cmSystemTools-whitespace'
acd2f84 cmSystemTools: Remove trailing whitespace
2011-08-02 15:09:53 -04:00
David Cole c6051b7abd Merge topic 'library-multiarch-issue-12326'
317d077 multiarch: Treat lib/<arch> as implicit link dir (#12326)
2011-08-02 15:09:45 -04:00
David Cole 2c7b38afa6 Merge topic 'FeatureSummaryImprovements'
b62349c FeatureSummary.cmake: update documentation
f366cf8 FeatureSummary.cmake: cosmetics
f407bb5 FeatureSummary.cmake: only higher TYPEs can override previous TYPEs
02d47ab FeatureSummary.cmake: error out when a REQUIRED package is missing
91a1527 FeatureSummary.cmake: add INCLUDE_QUIET_PACKAGES keyword
0671a02 FeatureSummary.cmake: remove "comment" field
aae13f4 Extend FeatureSummary: add PURPOSE of package and TYPE
2011-08-02 15:09:41 -04:00
KWSys Robot d8c1b44790 KWSys Nightly Date Stamp 2011-08-02 00:13:05 -04:00
Alex Neundorf e2e8c0a412 Also put builtin include dirs into CodeBlocks project file
Refactor code from CMakeFindEclipseCDT4.cmake so it can be used
alkso for CodeBlocks, and move it into new file
CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake.

Alex
2011-08-02 01:46:39 +02:00
Alex Neundorf 92c0dc50fc Remove useless line of code
Alex
2011-08-02 01:05:24 +02:00
Alex Neundorf d216a67e4a Provide macro write_basic_config_version_file()
This macro can be used to generate basic version files which can be
installed along a Config.cmake file to provide versioning support.

This (3rd try) is implemented using a macro, which maps
the COMPATIBILITY mode to a filename and configure_file()s the
resulting file.

Alex
2011-08-01 22:59:18 +02:00
KWSys Robot cbaf944568 KWSys Nightly Date Stamp 2011-08-01 00:13:34 -04:00
KWSys Robot 4d9874440a KWSys Nightly Date Stamp 2011-07-31 00:14:04 -04:00
KWSys Robot 55022455d0 KWSys Nightly Date Stamp 2011-07-30 00:14:02 -04:00
Brad King 1f641de4b8 Documentation: WIN32 not defined on Cygwin (#12334)
Since commit 85c0a69a (Cygwin: Do not define 'WIN32', 2010-12-17) WIN32
is not defined on Cygwin.  Update documentation of the WIN32 variable
accordingly.
2011-07-29 18:40:56 -04:00
Alex Neundorf a5683f80bd Patch by Campbell Barton: puts definitions into C::B project file
This enables Codeblocks and QtCreator to do proper highlighting based
on defined macros.

Alex
2011-07-29 23:51:31 +02:00
Alex Neundorf f32f6f0652 Don't put files from CMAKE_ROOT into CodeBlocks projects (#12110)
This causes that all files in C::B are displayed in a tree starting at /

Alex
2011-07-29 23:24:21 +02:00
Clinton Stimpson e6d2bcfde2 CPack/NSIS: Fix reinstall and multiple install issues when using components.
Fix NSIS template to more thoroughly use CPACK_PACKAGE_INSTALL_REGISTRY_KEY.
This allows different versions of software to have a separate sections in the
registry to keep track of things (installed components, and uninstall stuff).

Change default of CPACK_PACKAGE_INSTALL_REGISTRY_KEY to follow the value of
CPACK_PACKAGE_INSTALL_DIRECTORY so if an installation overwrites another installation,
the proper registry entries are more likely to be overwritten.

Fix CPack/NSIS generator to not insert code in the NSIS template to skip installation
of already installed components.  This enables a repair like behavior and also enables
installing patch releases on top of an older installation.
2011-07-29 12:23:22 -06:00
Steven Velez 05ddfbfe95 VS10: Add SCC support
Honor the properties that were added for earlier versions
of visual studio.
2011-07-29 14:06:28 -04:00
David Cole 37d8602cde Merge topic 'intel_fortran_vs2010' into fix-8707-add-vs-globals
Conflicts:
	Source/cmLocalVisualStudio7Generator.h
2011-07-29 10:22:33 -04:00
David Cole df9577259c Add support for Visual Studio project-specific globals (#8707)
Thanks to Pau Garcia i Quiles for the inspiration for the patch.
I've tweaked it a bit compared to what's in the bug tracker: this
commit does not allow empty global variable names.

I also added usage of the new feature to an existing test. Although
it has no effect on the resulting Visual Studio projects, you can
verify that the VSResource test produces a non-empty globals section
in the generated .vcproj(x) files.
2011-07-29 10:04:36 -04:00
KWSys Robot 5ef20b2dc5 KWSys Nightly Date Stamp 2011-07-29 00:14:03 -04:00
Brad King a343bc1c76 RunSingleCommand: Avoid assignment in condition
Several compilers warn about this case even when an extra layer of
parenthesis surrounds the assignment.  Make the condition explicit.
2011-07-28 10:43:11 -04:00
Johan Björk 642f10066a RunSingleCommand: Add a OUTPUT_NORMAL flag.
OUTPUT_NORMAL does no processing of the output streams, it just passes
them through the same streams as they were received on.
2011-07-28 10:43:09 -04:00
Johan Björk 856a9e499f RunSingleCommand: Replace verbose boolean with enum
No behaviour change, this prepares for adding a flag to skip the merging
of output streams.
2011-07-28 10:42:03 -04:00
Brad King 4096066723 RunSingleCommand: Fix indentation 2011-07-28 10:28:52 -04:00
Brad King acd2f84cc0 cmSystemTools: Remove trailing whitespace 2011-07-28 10:23:13 -04:00
KWSys Robot b6fb213ed1 KWSys Nightly Date Stamp 2011-07-28 00:12:21 -04:00
Modestas Vainius 317d077f6e multiarch: Treat lib/<arch> as implicit link dir (#12326)
Add multiarch library directories to the set of implicit link
directories.  In particular, this keeps lib/<arch> out of R(UN)PATH.
2011-07-27 09:13:58 -04:00
KWSys Robot 49a00ec2de KWSys Nightly Date Stamp 2011-07-27 00:14:05 -04:00
Brad King d6b2a1a9b3 Merge topic 'effective-platform-name'
74c73d5 Correct KWStyle line too long error
0c030ef Add use of EFFECTIVE_PLATFORM_NAME to generated Xcode projects.
2011-07-26 14:57:41 -04:00
Brad King 119dce33d3 Merge topic 'SetPropertyAppendString'
9dbba1b Fix #12342: Add APPEND_STRING option to set_property()
2011-07-26 14:57:32 -04:00
Brad King dc96b975c5 Merge topic 'MinorImprovementToTryCompileDocs'
d6b9df4 Minor fix to try_compile() docs (#12333)
2011-07-26 14:57:26 -04:00
Brad King 9ac8c938bb Merge topic 'doc-custom-command-multiple-targets-issue-12311'
0ece8f7 Document caveat of custom commands in multiple targets (#12311)
2011-07-26 14:56:48 -04:00
Brad King 25a35f5686 Merge topic 'DisableSwitchForFindPackage'
4a50b5f Add a basic test for CMAKE_DISABLE_FIND_PACKAGE_<package>
a66df08 Add documentation for the CMAKE_DISABLE_FIND_PACKAGE_<Name> switch
6e1d3ed Add a switch to disable a find_package() call completely
2011-07-26 14:56:22 -04:00
Brad King 9340ab28cc Merge topic 'performance_fix'
3e4ba89 Only pay for unused variable checking if it is on.
2011-07-26 14:55:21 -04:00
Brad King 4a18c30a42 Merge topic 'vs-ia64'
aed92cc Add VisualStudio 9 and 10 generators for Itanium platform
d44c68f VS: Factor Find64BitTools out of Win64 generator to parent
2011-07-26 14:54:56 -04:00
Brad King b3dba1a145 Merge topic 'mingw-make-use-native-echo-issue-12283'
6b4d3ad MinGW: Remove old workaround and use native echo (#12283)
2011-07-26 14:54:21 -04:00
KWSys Robot 0a939c86d6 KWSys Nightly Date Stamp 2011-07-26 00:13:12 -04:00
KWSys Robot 1a81da37b8 KWSys Nightly Date Stamp 2011-07-25 00:13:07 -04:00
KWSys Robot cb93c62643 KWSys Nightly Date Stamp 2011-07-24 00:13:03 -04:00
KWSys Robot c70c62db55 KWSys Nightly Date Stamp 2011-07-23 00:14:05 -04:00
KWSys Robot 5282623658 KWSys Nightly Date Stamp 2011-07-22 00:13:04 -04:00
KWSys Robot 3c33c5c5c2 KWSys Nightly Date Stamp 2011-07-21 00:14:05 -04:00
KWSys Robot c2deeae469 KWSys Nightly Date Stamp 2011-07-20 00:13:04 -04:00
David Cole 74c73d5fa0 Correct KWStyle line too long error 2011-07-19 11:33:01 -04:00
KWSys Robot 9923a2a2d5 KWSys Nightly Date Stamp 2011-07-19 00:14:04 -04:00
David Cole 0c030ef72c Add use of EFFECTIVE_PLATFORM_NAME to generated Xcode projects.
Facilitates building iOS projects, enabling switching back and forth
between simulator and device builds at development time.
2011-07-18 16:37:06 -04:00
KWSys Robot fefaaa09d9 KWSys Nightly Date Stamp 2011-07-18 00:10:09 -04:00
Alex Neundorf 91a1527735 FeatureSummary.cmake: add INCLUDE_QUIET_PACKAGES keyword
Now found packages are not stored in ENABLED/DISABLED_FEATURES
anymore, but always in PACKAGES_FOUND/NOT_FOUND.
ENABLED/DISABLED_FEATURES is now only used via
ADD_FEATURE_INFO(), e.g. for stuff set via option().

Alex
2011-07-17 17:48:00 +02:00
KWSys Robot 07bb5b77ec KWSys Nightly Date Stamp 2011-07-17 00:14:04 -04:00
KWSys Robot 5d963edc5e KWSys Nightly Date Stamp 2011-07-16 00:10:06 -04:00
Alex Neundorf 9dbba1b464 Fix #12342: Add APPEND_STRING option to set_property()
set_property() has APPEND, which creates a list. E.g. when
appending to COMPILE_FLAGS a string is needed, not a list.
With the APPEND_STRING option the value is append as string,
not as list.

Alex
2011-07-15 20:57:33 +02:00
KWSys Robot 8b238f4945 KWSys Nightly Date Stamp 2011-07-15 00:12:06 -04:00
KWSys Robot 60087f7128 KWSys Nightly Date Stamp 2011-07-14 00:10:22 -04:00
KWSys Robot 37340687a4 KWSys Nightly Date Stamp 2011-07-13 00:13:06 -04:00
Alex Neundorf d6b9df409c Minor fix to try_compile() docs (#12333)
Alex
2011-07-12 22:37:38 +02:00
KWSys Robot 39a9403a70 KWSys Nightly Date Stamp 2011-07-12 00:14:11 -04:00
KWSys Robot dabdf9248f KWSys Nightly Date Stamp 2011-07-11 00:10:05 -04:00
KWSys Robot 349c5c2160 KWSys Nightly Date Stamp 2011-07-10 00:13:04 -04:00
KWSys Robot 57109cb67f KWSys Nightly Date Stamp 2011-07-09 00:10:10 -04:00
Bill Hoffman 6c72d25aee Initial support for Intel Fortran VS2010. 2011-07-08 17:08:43 -04:00
KWSys Robot b4b134a4fa KWSys Nightly Date Stamp 2011-07-08 00:13:11 -04:00
KWSys Robot a8e0287d86 KWSys Nightly Date Stamp 2011-07-07 00:12:12 -04:00
KWSys Robot 69ed07ad2d KWSys Nightly Date Stamp 2011-07-06 00:14:08 -04:00
KWSys Robot aa20138dbc KWSys Nightly Date Stamp 2011-07-05 00:12:06 -04:00
KWSys Robot 127bcb39bc KWSys Nightly Date Stamp 2011-07-04 00:12:05 -04:00
KWSys Robot 42eef30652 KWSys Nightly Date Stamp 2011-07-03 00:12:11 -04:00
Alex Neundorf e4f603b698 Implement find-package mode of cmake
In find-package mode, cmake executes Modules/CMakeFindPackage.cmake,
which calls find_package(), and this is then evaluated in cmake.cxx,
which prints an appropriate message to stdout, so it can be used
e.g. in a normal Makefile:

$ /opt/cmake-HEAD/bin/cmake --find-package -DNAME=JPEG
 -DCOMPILER_ID=GNU -DLANGUAGE=C -DMODE=EXIST
JPEG found.
$ /opt/cmake-HEAD/bin/cmake --find-package -DNAME=JPEG
 -DCOMPILER_ID=GNU -DLANGUAGE=C -DMODE=COMPILE

$ /opt/cmake-HEAD/bin/cmake --find-package -DNAME=JPEG
 -DCOMPILER_ID=GNU -DLANGUAGE=C -DMODE=LINK
-rdynamic -ljpeg

Alex
2011-07-02 23:14:28 +02:00
Alex Neundorf a91d662f46 Add find-package mode, which does nothing yet
-add command line argument --find-package and handle it,
 i.e. call an empty function cmake::FindPackage()
-add basic help

Alex
2011-07-02 17:50:05 +02:00
Alex Neundorf b976e70063 Make clLocalGenerator::GetTargetFlags() public
This will later on be used for getting the link flags

Alex
2011-07-02 17:08:34 +02:00
KWSys Robot fe9ac70076 KWSys Nightly Date Stamp 2011-07-02 00:13:02 -04:00
KWSys Robot 5a022c3339 KWSys Nightly Date Stamp 2011-07-01 00:13:04 -04:00
Brad King 0ece8f79ed Document caveat of custom commands in multiple targets (#12311)
A common mistake when using custom commands is to list the output of a
command in multiple targets that may build in parallel.  Warn against
this case in the documentation and suggest a better approach.
2011-06-30 08:43:32 -04:00
KWSys Robot f9b69873a9 KWSys Nightly Date Stamp 2011-06-30 00:13:06 -04:00
KWSys Robot e1237478f1 KWSys Nightly Date Stamp 2011-06-29 00:12:05 -04:00
KWSys Robot 34238d5bcb KWSys Nightly Date Stamp 2011-06-28 00:13:12 -04:00
Brad King 8251b20d4b Import sha2 implementation 1.1 from Aaron D. Gifford
Update cm_sha2.[hc] from sha2.[hc] in "sha2-1.1-ALPHA.tgz" downloaded
today from

  http://www.aarongifford.com/computers/sha.html

with trivial whitespace cleanup.  This adds SHA-224 support.
2011-06-27 14:55:30 -04:00
Brad King 9912c41c17 Import sha2 implementation 1.0 from Aaron D. Gifford
Copy cm_sha2.[hc] from sha2.[hc] in "sha2-1.0.tar.gz" downloaded today
from

  http://www.aarongifford.com/computers/sha.html

with trivial whitespace cleanup.  Also fix #include to account for
rename.
2011-06-27 14:52:25 -04:00
KWSys Robot ea1a519a35 KWSys Nightly Date Stamp 2011-06-27 00:10:06 -04:00
KWSys Robot 11b4eb2b8a KWSys Nightly Date Stamp 2011-06-26 00:10:07 -04:00
KWSys Robot 428cfb8dcb KWSys Nightly Date Stamp 2011-06-25 00:12:04 -04:00
Brad King 4ccf44bcb2 Merge topic 'use_devenv_forvs2010'
8555c2b Look for VCExpress as a possible build tool as well as devenv.
ed0075b Use relative paths for custom command inputs.
38368d5 Revert "With very long file names, VS 2010 was unable to compile files."
8cd66dc Use devenv instead of msbuild for vs2010.
2011-06-24 17:32:03 -04:00
KWSys Robot 26607e9ae3 KWSys Nightly Date Stamp 2011-06-24 00:12:38 -04:00
Bill Hoffman 8555c2b4b7 Look for VCExpress as a possible build tool as well as devenv. 2011-06-23 15:29:25 -04:00
Alex Neundorf a66df08543 Add documentation for the CMAKE_DISABLE_FIND_PACKAGE_<Name> switch
Alex
2011-06-23 11:09:41 +02:00
KWSys Robot 672b6ca5e4 KWSys Nightly Date Stamp 2011-06-23 00:12:34 -04:00
Bill Hoffman ed0075bdb7 Use relative paths for custom command inputs.
For source files we use full paths.  This allows for longer directory
names with VS2010. However, the use of full paths causes the GUI
to not display the custom commands.
2011-06-22 11:52:15 -04:00
KWSys Robot d0d5540dc6 KWSys Nightly Date Stamp 2011-06-22 00:12:04 -04:00
Bill Hoffman 38368d52f3 Revert "With very long file names, VS 2010 was unable to compile files."
This reverts commit 945f2c2214.
2011-06-21 16:00:31 -04:00
Bill Hoffman 3e4ba898c1 Only pay for unused variable checking if it is on. 2011-06-21 15:59:10 -04:00
Alex Neundorf 6e1d3edb4d Add a switch to disable a find_package() call completely
As discussed, this adds a switch CMAKE_DISABLE_FIND_PACKAGE_<name>,
which, when set to TRUE, keeps the find_package() command from executing.
When the package is REQUIRED at the same time, an error is generated.

Alex
2011-06-21 21:18:23 +02:00
KWSys Robot d9d7e8ffa5 KWSys Nightly Date Stamp 2011-06-21 00:13:02 -04:00
Brad King 2822bd184d Merge topic 'doc-spelling-formatting-issue-12287'
d66459b Documentation: Fix spelling / formatting errors (#12287)
2011-06-20 15:13:37 -04:00
Brad King 146a7aee62 Merge topic 'find_library-lib64-issue-12247+12248'
3ba1713 find_library: Use lib->lib64 conversion in CXX-only projects (#12247,#12248)
2011-06-20 15:13:19 -04:00
Matej Hribernik aed92ccea6 Add VisualStudio 9 and 10 generators for Itanium platform 2011-06-20 08:31:13 -04:00
Matej Hribernik d44c68f39e VS: Factor Find64BitTools out of Win64 generator to parent
It will be shared with a forthcoming IA64 generator.
2011-06-20 08:29:40 -04:00
KWSys Robot 5c668b821f KWSys Nightly Date Stamp 2011-06-20 00:13:19 -04:00
Brad King 73d593033f KWSys: Recognize color TERM=screen-256color-bce (#12287)
Author: Davide Mancusi <arekfu@gmail.com>
Acked-By: Modestas Vainius <modax@debian.org>
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627853
2011-06-19 18:17:07 -04:00
Modestas Vainius d66459be8b Documentation: Fix spelling / formatting errors (#12287)
The patch fixes the following problems spotted by lintian:

W: cmake-data: manpage-has-errors-from-man usr/share/man/man1/cmakemodules.1.gz 2641: warning [p 39, 1.5i]: can't break line
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakeprops.1.gz explict explicit
I: cmake: spelling-error-in-binary usr/bin/cmake explict explicit
I: cmake: spelling-error-in-binary usr/bin/cpack explict explicit
I: cmake: spelling-error-in-binary usr/bin/ctest explict explicit
W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 7300: warning [p 120, 3.3i]: can't break line
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz explict explicit
I: cmake-curses-gui: spelling-error-in-binary usr/bin/ccmake explict explicit
I: cmake-qt-gui: spelling-error-in-binary usr/bin/cmake-gui explict explicit
2011-06-19 18:08:05 -04:00
KWSys Robot ac8a6bf085 KWSys Nightly Date Stamp 2011-06-19 00:13:03 -04:00
KWSys Robot e5fe580fcc KWSys Nightly Date Stamp 2011-06-18 00:12:05 -04:00
KWSys Robot 594681d2c4 KWSys Nightly Date Stamp 2011-06-17 00:12:26 -04:00
Brad King 6b4d3ad32a MinGW: Remove old workaround and use native echo (#12283)
The workaround added by commit 7e92f0b4 (Hack to make echo command work
properly in mingw32-make, 2006-10-05) and updated by commit 69356d8a
(Juse use cmake -E echo instead of the native echo, 2006-10-13) no
longer seems necessary with modern mingw32-make.  Furthermore it slows
performance due to the time spent loading a cmake process instead of
plain echo.
2011-06-16 15:43:17 -04:00
KWSys Robot 0751106f2f KWSys Nightly Date Stamp 2011-06-16 00:13:08 -04:00
Brad King 3ba1713f6f find_library: Use lib->lib64 conversion in CXX-only projects (#12247,#12248)
Do not require the C language to be enabled to do lib->lib64 conversion.
The check was originally added by commit a5825cd1 (check in new find
stuff, 2006-03-02) to ensure that CMAKE_SIZEOF_VOID_P is set.  Since
commit 3fdf1411 (FIND_LIBRARY should not require CMAKE_SIZEOF_VOID_P,
2008-02-11) the code following the check does not fail when the variable
is not set, so just remove the original check.  This allows conversion
for any language that is enabled so long as the address size is known.

Reported-by: Christoph Höger <choeger@cs.tu-berlin.de>
2011-06-15 08:32:22 -04:00
KWSys Robot a666810643 KWSys Nightly Date Stamp 2011-06-15 00:13:09 -04:00
Brad King cc746a6eb7 Merge topic 'library-multiarch-issue-12037'
1ed19bc multiarch: Set CMAKE_LIBRARY_ARCHITECTURE_REGEX for Linux|Hurd|kFreeBSD
52a6ed2 Test find_package multiarch support (#12037)
b41ad3b Teach find_(library|package) about Linux multiarch (#12037)
2011-06-14 13:23:51 -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
KWSys Robot 46e3a6c9b9 KWSys Nightly Date Stamp 2011-06-13 00:12:06 -04: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 b41ad3b399 Teach find_(library|package) about Linux multiarch (#12037)
Implement support for multiarch as specified here:

  http://wiki.debian.org/Multiarch
  https://wiki.ubuntu.com/MultiarchSpec

Detect the <arch> part of <prefix>/lib/<arch> from the implicit library
search path from each compiler to set CMAKE_<lang>_LIBRARY_ARCHITECTURE.
Define CMAKE_LIBRARY_ARCHITECTURE using one of these values (they should
all be the same).  Teach the find_library and find_package commands to
search <prefix>/lib/<arch> whenever they would search <prefix>/lib.
2011-06-08 10:04:44 -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 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
KWSys Robot 43824d44f4 KWSys Nightly Date Stamp 2011-06-04 00:13:05 -04:00
KWSys Robot 597ab43604 KWSys Nightly Date Stamp 2011-06-03 00:13:11 -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 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
Brad King 3232136fc8 Merge topic 'dont-compress-memcheck-output'
0e591ed Fix type conversion warning
9c3a0b9 We will actually compress memcheck output if the server supports it.
8024c53 Dynamic analysis test output should not be compressed.
2011-06-02 11:29:09 -04:00
Bill Hoffman 7815e90e21 Fix for bug#10798. VS10 did not append -I flags with COMPILE_FLAGS prop.
This fix adds a test for this case for all generators.
2011-06-02 10:28:10 -04:00
KWSys Robot 5764739f52 KWSys Nightly Date Stamp 2011-06-02 00:13:04 -04:00
Brad King faa7ec6e18 Teach file(DOWNLOAD|UPLOAD) to timeout after inactivity
Add option INACTIVITY_TIMEOUT to terminate the operation if there is no
progress for more than a given amount of time.
2011-06-01 09:55:42 -04:00
KWSys Robot 628b2a129f KWSys Nightly Date Stamp 2011-06-01 00:12:05 -04:00
Sean McBride a27edd8a05 Fix XCode -> Xcode typos, notably in man page (#12231) 2011-05-31 09:13:00 -04:00
Daniel R. Gomez a4cba0e8be Fix plugin API for gcc 2.9-aix51-020209 (#12233)
Use proper C function prototype syntax to satisfy this compiler.
2011-05-31 09:08:59 -04:00
KWSys Robot 8af1eaf499 KWSys Nightly Date Stamp 2011-05-31 00:12:04 -04:00
KWSys Robot 5e40058e26 KWSys Nightly Date Stamp 2011-05-30 00:13:03 -04:00
KWSys Robot 9c6e1e03d0 KWSys Nightly Date Stamp 2011-05-29 00:13:04 -04:00
KWSys Robot 909bab1f4f KWSys Nightly Date Stamp 2011-05-28 00:13:04 -04:00
Rolf Eike Beer ecdad65a45 CMake: Update documentation of STRING(SUBSTRING) for length -1 (#10740) 2011-05-27 16:25:08 -04:00
Zach Mullen 0e591ed4c2 Fix type conversion warning 2011-05-27 10:45:41 -04:00
KWSys Robot 1e885b1bb5 KWSys Nightly Date Stamp 2011-05-27 00:13:04 -04:00
Zach Mullen 9c3a0b9f14 We will actually compress memcheck output if the server supports it.
This change won't be functional until the next release of CDash due to the
version comparison.
2011-05-26 14:50:07 -04:00
KWSys Robot ba6579f7a3 KWSys Nightly Date Stamp 2011-05-26 00:12:06 -04:00
KWSys Robot 8b17fd6725 KWSys Nightly Date Stamp 2011-05-25 00:13:03 -04:00
Brad King e51bbc14f6 Merge topic 'output-compile-lines'
cdc2b41 Fix CompileCommandOutput test build on Windows
7039d1f Fix CompileCommandOutput test for Make tools not supporting spaces
4268e3d run_compile_commands: Cast istream::get() result to char
c45c60b run_compile_commands: Avoid extra stl vector conversion
7c5be51 run_compile_commands: Avoid shadow in std::map<>::at workaround
169bb05 Provide std::map<>::at for use in run_compile_commands
4e2185c Make std::map usage more portable in language=>flags/defines maps
a7e7a04 Fix run_compile_commands build on Apple GCC 3.3
c9174c0 Fix signed/unsigned comparison in EscapeJSON
8346a28 Only offer the compile command output feature on unix systems
0e6b05f Adds a test for the compile command line output.
5674844 make compile command output optional
fe07b05 implement cxx command output
65c0c24 cache flags and defines
3f064ef refactor flags and defines
2011-05-24 14:48:14 -04:00
Brad King c5e00bf0b2 Merge topic 'fix-11925-vcxproj-filters-mismatch'
a6b52bd VS10: Write header-only files in correct xml element (#11925)
2011-05-24 14:34:56 -04:00
Brad King 44b7f2f5bc Merge topic 'string-RANDOM-seed'
7ff98b7 Fix forced-seed argument type in string(RANDOM)
3d92c8c Explicitly cast time value in cmSystemTools::RandomSeed
eb6f461 VS 6: Define _WIN32_WINNT to load wincrypt.h correctly
e1b0a11 Improve string(RANDOM) default seed
2011-05-24 14:34:51 -04:00
Brad King 0f843584f3 Merge topic 'doc-output_required_files'
5cf4ff6 Document status of output_required_files command (#12214)
2011-05-24 14:34:48 -04:00
Brad King a78acb2c82 Merge topic 'fix-cpack-osxx11-perms'
0fb388c Ensure executable files have executable permissions.
2011-05-24 14:34:37 -04:00
Brad King da1b688325 Merge topic 'rule-messages'
dca304e Merge branch 'MakeCodeBlocksGeneratorNonVerbose2' into rule-messages
051cee0 Revert "Honor RULE_MESSAGES property for build target messages" (#12190)
2011-05-24 14:34:33 -04:00
Brad King 7ffb678e4b Merge topic 'intel-12-vs-2005'
3a8add0 ENH: Fix Intel 12 plugin project generation for VS < 10
2011-05-24 14:34:28 -04:00
KWSys Robot 0c64fcd309 KWSys Nightly Date Stamp 2011-05-24 00:12:11 -04:00
David Cole a6b52bd8ef VS10: Write header-only files in correct xml element (#11925) 2011-05-23 17:30:23 -04:00
Brad King 7ff98b7a8c Fix forced-seed argument type in string(RANDOM)
Clang points out that local variable 'seed' needs to be "unsigned int":

Source/cmStringCommand.cxx:828:21: warning: operands of ? are integers
of different signs: 'int' and 'unsigned int' [-Wsign-compare]
    srand(force_seed? seed : cmSystemTools::RandomSeed());
                    ^ ~~~~   ~~~~~~~~~~~~~~~~~~~~~~~~~~~
2011-05-23 15:57:41 -04:00
Brad King 5cf4ff6e1f Document status of output_required_files command (#12214)
This command is barely functional and exists only for historical
reasons.  State this in the documentation.
2011-05-23 13:21:15 -04:00
KWSys Robot cac769f3a7 KWSys Nightly Date Stamp 2011-05-23 00:12:39 -04:00
KWSys Robot b3bab3ce03 KWSys Nightly Date Stamp 2011-05-22 00:13:03 -04:00
KWSys Robot 41c83c1bdc KWSys Nightly Date Stamp 2011-05-21 00:13:03 -04:00
KWSys Robot c5aae0e625 KWSys Nightly Date Stamp 2011-05-20 00:12:09 -04:00
Brad King 3d92c8c827 Explicitly cast time value in cmSystemTools::RandomSeed
Use static_cast to avoid warnings like

 conversion to ‘unsigned int’ from ‘__time_t’ may alter its value
 conversion to ‘unsigned int’ from ‘__suseconds_t’ may alter its value

We do not care if the value is truncated because we are looking for just
32 bits anyway.
2011-05-19 07:56:04 -04:00
KWSys Robot 14abf9f3d8 KWSys Nightly Date Stamp 2011-05-19 00:10:07 -04:00
Brad King eb6f461fc1 VS 6: Define _WIN32_WINNT to load wincrypt.h correctly 2011-05-18 10:09:23 -04:00
Brad King c45c60b24f run_compile_commands: Avoid extra stl vector conversion
The Sun compiler does not provide the proper vector constructor to
initialize it from an iterator pair of a non-matching type.  Extend the
ParseUnixCommandLine API to provide a vector of the proper type so no
conversion is needed.
2011-05-18 09:44:28 -04:00
KWSys Robot c7d4cf1db1 KWSys Nightly Date Stamp 2011-05-18 00:12:05 -04:00
Brad King e1b0a11dd4 Improve string(RANDOM) default seed
The naive time(0) seed is unique only within one second.  Instead try to
read a real source of entropy and otherwise fall back to a combination
of the process id and high-resolution time.
2011-05-17 10:07:26 -04:00
Brad King 4e2185cbd0 Make std::map usage more portable in language=>flags/defines maps
Older versions of GCC, the HP compiler, and the SGI MIPSpro compiler do
not like the use of make_pair in this case and the conversions it
requires:

  a value of type "const char *" cannot be used to initialize an entity
  of type "char [1]"

  /usr/include/g++-3/stl_pair.h:68: assignment of read-only location

Instead use a map lookup pattern already used throughout the rest of our
source tree.
2011-05-17 08:50:55 -04:00
KWSys Robot dc2a45fa3f KWSys Nightly Date Stamp 2011-05-17 00:13:04 -04:00
Wesley Turner 0fb388c733 Ensure executable files have executable permissions.
Fix the OSX X11 CPack generator to make sure the installer
that it generates contains executable files.
2011-05-16 18:15:32 -04:00
Brad King c9174c0e4b Fix signed/unsigned comparison in EscapeJSON 2011-05-16 11:55:56 -04:00
Brad King dca304ec8d Merge branch 'MakeCodeBlocksGeneratorNonVerbose2' into rule-messages
Conflicts:
	Source/cmGlobalUnixMakefileGenerator3.cxx
	Source/cmGlobalUnixMakefileGenerator3.h
2011-05-16 11:28:07 -04:00
Brad King 051cee0096 Revert "Honor RULE_MESSAGES property for build target messages" (#12190)
This reverts commit dc36b34994.  It broke
dependency logic instead of only silencing messages.  Revert to previous
behavior.
2011-05-16 11:26:58 -04:00
Brad King 3a8add058b ENH: Fix Intel 12 plugin project generation for VS < 10
Suggested-by: Dick Munroe <munroe@csworks.com>
2011-05-16 10:13:04 -04:00
KWSys Robot a77dfb6d64 KWSys Nightly Date Stamp 2011-05-16 00:12:06 -04:00
KWSys Robot 41ce1ea2d4 KWSys Nightly Date Stamp 2011-05-15 00:12:04 -04:00
KWSys Robot 30bf6162be KWSys Nightly Date Stamp 2011-05-14 00:13:04 -04:00
KWSys Robot 69677ca471 KWSys Nightly Date Stamp 2011-05-13 00:12:04 -04:00
KWSys Robot da9ba5726f KWSys Nightly Date Stamp 2011-05-12 00:13:02 -04:00
KWSys Robot 692f62fc3e KWSys Nightly Date Stamp 2011-05-11 00:12:05 -04:00
Brad King 7faffc988c Merge topic 'doc-CMAKE_BUILD_TYPE-config-case-issue-12148'
d7d71eb Fix case typo in CMAKE_BUILD_TYPE docs (#12148)
2011-05-10 13:58:23 -04:00
Brad King a4d935933b Merge topic 'FixVirtualFoldersInEclipse'
a7d8d49 -fix VirtualFolders in Eclipse under Windows
2011-05-10 13:58:15 -04:00
KWSys Robot c32262bc04 KWSys Nightly Date Stamp 2011-05-10 00:10:21 -04:00
Brad King ee9fc4b1d3 KWSys: Fix leaked FILE in EncodeExecutable error case
This leak was detected by cppcheck static analysis.

Author: Hans Johnson <hans-johnson@uiowa.edu>
Change-Id: I1b81cb245acb9a6033f24ecc8d1452ca4df8371a
2011-05-09 08:40:03 -04:00
KWSys Robot afa83eb4cf KWSys Nightly Date Stamp 2011-05-09 08:40:03 -04:00
KWSys Robot 6aa45ac2ee KWSys Nightly Date Stamp 2011-05-08 00:12:16 -04:00
KWSys Robot d3e09bba6a KWSys Nightly Date Stamp 2011-05-07 00:13:05 -04:00
Alex Neundorf a7d8d49b8f -fix VirtualFolders in Eclipse under Windows
Under Windows "locationURI" must be used for virtual folders, while
"location" must be used only for linked folders. Under Linux it doesn't
seem to matter.

Alex
2011-05-06 22:44:45 +02:00
KWSys Robot 303c7e8f40 KWSys Nightly Date Stamp 2011-05-06 00:12:04 -04:00
KWSys Robot 19e3397942 KWSys Nightly Date Stamp 2011-05-05 00:10:10 -04:00
KWSys Robot aad6c4481d KWSys Nightly Date Stamp 2011-05-04 00:13:04 -04:00
Brad King d7d71ebda3 Fix case typo in CMAKE_BUILD_TYPE docs (#12148)
Reported-by: Stephen Kelly <steveire@gmail.com>
2011-05-03 12:49:41 -04:00
KWSys Robot 9c84f747c3 KWSys Nightly Date Stamp 2011-05-03 09:10:01 -04:00
KWSys Robot c71f5806d2 KWSys Nightly Date Stamp 2011-05-03 09:05:06 -04:00
KWSys Robot 9ea53478a6 KWSys Nightly Date Stamp 2011-05-01 00:13:03 -04:00
KWSys Robot 74b4020250 KWSys Nightly Date Stamp 2011-04-30 00:13:04 -04:00
Zach Mullen 8024c53389 Dynamic analysis test output should not be compressed. 2011-04-29 12:12:26 -04:00
KWSys Robot 14f43c3e49 KWSys Nightly Date Stamp 2011-04-29 00:13:03 -04:00
KWSys Robot cade78040d KWSys Nightly Date Stamp 2011-04-28 00:13:04 -04:00
KWSys Robot a3a581f8cd KWSys Nightly Date Stamp 2011-04-27 00:13:03 -04:00
KWSys Robot 667ff4023f KWSys Nightly Date Stamp 2011-04-26 00:10:20 -04:00
Manuel Klimek 5674844de4 make compile command output optional 2011-04-25 13:27:58 -04:00
Manuel Klimek fe07b0557b implement cxx command output 2011-04-25 13:27:58 -04:00
Manuel Klimek 65c0c24a29 cache flags and defines 2011-04-25 13:27:58 -04:00
Manuel Klimek 3f064efe40 refactor flags and defines 2011-04-25 13:27:58 -04:00
KWSys Robot 00f88cc095 KWSys Nightly Date Stamp 2011-04-25 00:13:02 -04:00
KWSys Robot b66ec801b8 KWSys Nightly Date Stamp 2011-04-24 00:13:03 -04:00
KWSys Robot 97ed208db6 KWSys Nightly Date Stamp 2011-04-23 00:13:04 -04:00
KWSys Robot 2b1a165a38 KWSys Nightly Date Stamp 2011-04-22 00:13:04 -04:00
KWSys Robot 12377a0e60 KWSys Nightly Date Stamp 2011-04-21 00:13:03 -04:00
KWSys Robot 2f50ec5f5c KWSys Nightly Date Stamp 2011-04-20 00:11:33 -04:00
Brad King 19a4b8856d Merge topic 'find_package-system-registry'
08b9397 find_package: Fix system package registry test path conversion
93021ad find_package: Test system package registry when possible
b95f3ca find_package: Check both 32-bit and 64-bit registry views
a0d76c1 find_package: Search a "system package registry"
549458f find_package: Document user package registry locations
c9563db find_package: Cleanup user package registry less aggressively
4df1197 find_package: Rename implementation of user package registry
2011-04-19 14:08:23 -04:00
Brad King bf238d6f0e Merge topic 'CPackRPM-fix12096'
d3fd945 CPackRPM  Fix #12096: handle absolute install path with component install
2011-04-19 14:08:13 -04:00
Brad King f393d8c2f8 Merge topic 'improve-debug-trycompile-help-text'
7f6f606 CMake: Clarify the --debug-trycompile help text
2011-04-19 14:08:06 -04:00
Brad King cc214c68dd Merge topic 'MoreGraphVizFeatures'
08fa5dd Also generate dependers-graphviz files.
4f96a76 GRAPHVIZ_IGNORE_TARGETS is now a list of regular expressions
5698ad2 Make it possible to exlude external libs from dot files
2011-04-19 14:07:36 -04:00
KWSys Robot b1a9f7a275 KWSys Nightly Date Stamp 2011-04-19 00:13:07 -04:00
KWSys Robot 241de9e89c KWSys Nightly Date Stamp 2011-04-18 00:12:15 -04:00
Eric NOULARD d3fd945900 CPackRPM Fix #12096: handle absolute install path with component install 2011-04-17 17:12:38 +02:00
KWSys Robot 046b615bc8 KWSys Nightly Date Stamp 2011-04-17 00:13:04 -04:00
KWSys Robot 7b9d679b76 KWSys Nightly Date Stamp 2011-04-16 00:13:09 -04:00
KWSys Robot b590b261b6 KWSys Nightly Date Stamp 2011-04-15 00:13:04 -04:00
KWSys Robot 342628aa20 KWSys Nightly Date Stamp 2011-04-14 00:13:05 -04:00
Brad King b95f3cac91 find_package: Check both 32-bit and 64-bit registry views
The system package registry is under HKEY_LOCAL_MACHINE\SOFTWARE which
has separate views for 32-bit and 64-bit applications.  Look in both
views, but prefer the architecture matching the build target platform.
2011-04-13 13:17:42 -04:00
Brad King a0d76c10a7 find_package: Search a "system package registry"
Generalize the "user package registry" created by commit ed0650f6 (Teach
find_package to search a "package registry", 2009-09-01).  Define a
corresponding "system" registry key under HKEY_LOCAL_MACHINE.  This
gives package installers a place to create a registry value that points
at the right location for find_package() to locate the package.
2011-04-13 13:17:00 -04:00
Brad King 549458f280 find_package: Document user package registry locations
Specify the Windows registry key under HKEY_CURRENT_USER and directory
on UNIX platforms in which the package registry is stored.
2011-04-13 13:13:58 -04:00
Brad King c9563dbe1a find_package: Cleanup user package registry less aggressively
Delete only REG_SZ entries that are specifically detected to point to
invalid paths.  This will allow future versions to add other value types
for different purposes.
2011-04-13 12:59:00 -04:00
Brad King 4df119773c find_package: Rename implementation of user package registry
Rename {Registry => UserRegistry} in names associated specifically with
the user package registry and not registry access in general.
2011-04-13 12:57:18 -04:00
Brad King 54afd0940c KWSys: Remove unused CheckCXXSourceRuns cmake module
This file has not been used in KWSys since commit "Moved test for large
file support into kwsysPlatformCxxTests.cxx", 2006-08-25.  CMake 2.6.0
and above come with a copy of this module anyway, and KWSys has required
CMake 2.6.3 since commit "KWSys: Require at least CMake 2.6.3",
2011-03-01.
2011-04-13 08:20:03 -04:00
KWSys Robot 3ec0119f43 KWSys Nightly Date Stamp 2011-04-13 00:13:03 -04:00
David Cole 7f6f6060c3 CMake: Clarify the --debug-trycompile help text 2011-04-12 16:21:54 -04:00
Brad King 8997dc935c Merge topic 'vs10-custom-working-directory-issue-11938'
234bae7 VS10: Fix exit code of custom commands with setlocal/endlocal (#11938)
b98fdd5 VS: Use setlocal/endlocal only in VS 10 custom commands
06fcbc4 VS10: Fix working directory of consecutive custom commands (#11938)
2011-04-12 14:44:25 -04:00
Brad King bf4349b23c Merge topic 'CPackDeb-fix12061'
b22fcfb CPackDeb: Handle dirs for CONTROL_EXTRA correctly when packaging components
2011-04-12 14:44:22 -04:00
Brad King f3e48acad0 Merge topic 'windows-make-working-drive'
42a732b Change working drive only in MinGW Makefiles
b567613 Fix working drive of make rules on Windows
2011-04-12 14:44:19 -04:00
Brad King 89460b7fd7 Merge topic 'xcode-attribute-conditions'
c519bb2 XCode: Also qoute [] as needed to set build-configurations.
2011-04-12 14:43:29 -04:00
Brad King 6507f12377 Merge topic 'find_package-forward-components'
9fc7ea4 find_package: Forward component list for recursive calls in modules
2011-04-12 14:43:20 -04:00
Brad King eeb2e2eaec Merge topic 'libarchive-strip-xattr-issue-11958'
e8558ef cmArchiveWrite: Clear xattr and acl from entries (#11958)
2011-04-12 14:43:15 -04:00
KWSys Robot 2adb7d36f2 KWSys Nightly Date Stamp 2011-04-12 00:13:01 -04:00
Brad King 234bae7a20 VS10: Fix exit code of custom commands with setlocal/endlocal (#11938)
Use the pattern

  setlocal
  ...
  endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone
  :cmErrorLevel
  exit /b %1
  :cmDone
  if %errorlevel% neq 0 goto :VCEnd

in custom commands to preserve the %errorlevel% from inside the
setlocal/endlocal block.
2011-04-11 11:54:01 -04:00
Brad King b98fdd5284 VS: Use setlocal/endlocal only in VS 10 custom commands
The setlocal/endlocal and errorlevel pattern added by commit 06fcbc47
(VS10: Fix working directory of consecutive custom commands, 2011-04-08)
does not work well in VS 7.1.  Restore the original behavior for VS
versions that do not need the new behavior.
2011-04-11 11:53:31 -04:00
KWSys Robot a72c0a2004 KWSys Nightly Date Stamp 2011-04-11 00:12:19 -04:00
KWSys Robot c2ef7abe04 KWSys Nightly Date Stamp 2011-04-10 00:13:04 -04:00
Martin Konrad b22fcfb0c5 CPackDeb: Handle dirs for CONTROL_EXTRA correctly when packaging components
Copy the files specified in CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA to the right
directory when packaging components. This fixes #12061.
Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
2011-04-09 09:30:19 +02:00
KWSys Robot 4e9506ac31 KWSys Nightly Date Stamp 2011-04-09 00:13:04 -04:00
Brad King 42a732ba20 Change working drive only in MinGW Makefiles
The parent commit assumed that "cd /d" would work in all Windows shells.
While all modern versions of windows have shells that support it, the
shells used by NMake and Borland make do not.  Borland make does not
seem to even support changing drive letters with "d:".  Just revert the
feature for all make tools except MinGW where the shell is known to
support this feature.
2011-04-08 16:12:18 -04:00
Brad King b5676134ce Fix working drive of make rules on Windows
Teach cmLocalUnixMakefileGenerator3::CreateCDCommand to change working
directories for make tools using a Windows shell using "cd /d" instead
of just "cd".  This tells the shell to change the current drive letter
as well as the working directory on that drive.

Commit abaa0267 (When the working directory for a custom command is on
another drive..., 2007-12-17) fixed the same problem for VS IDE
generators as reported by issue #6150.
2011-04-08 15:36:55 -04:00
Brad King 06fcbc4757 VS10: Fix working directory of consecutive custom commands (#11938)
The VS 10 msbuild tool uses a single command shell to invoke all the
custom command scripts in a project.  Isolate the environment and
working directory of custom commands using setlocal/endlocal.  The
form of each command is

  set errlev=
  setlocal
  cd c:\work\dir
  if %errorlevel% neq 0 goto :cmEnd
  c:
  if %errorlevel% neq 0 goto :cmEnd
  command1 ...
  if %errorlevel% neq 0 goto :cmEnd
  ...
  commandN ...
  if %errorlevel% neq 0 goto :cmEnd
  :cmEnd
  endlocal & set errlev=%errorlevel%
  if %errlev% neq 0 goto :VCEnd

so that all changes to the environment and working directory are
isolated within the script and the return code is preserved.
2011-04-08 15:36:16 -04:00
KWSys Robot a961ecdad0 KWSys Nightly Date Stamp 2011-04-08 00:12:56 -04:00
Brad King 9fc7ea4c62 find_package: Forward component list for recursive calls in modules
Some find modules call find_package recursively to locate a package
configuration file for the package instead of searching for individual
pieces.  Commit 79e9b755 (Help recursive find_package calls in modules,
2008-10-03) taught find_package to forward the version number and EXACT
arguments through the recursive call automatically.  Do the same for the
component list.
2011-04-07 15:36:05 -04:00
Johan Björk c519bb2bb6 XCode: Also qoute [] as needed to set build-configurations. 2011-04-07 13:17:03 -04:00
Brad King e8558efa01 cmArchiveWrite: Clear xattr and acl from entries (#11958)
When reading archive entries from disk strip any xattr and acl entry
headers that may have been loaded from the filesystem (e.g. selinux).
These fields are only useful for backup tools and not for packaging and
distribution of software.  Furthermore, the GNU tar 1.15.1 on at least
one Linux distribution treats unknown entry headers as an error rather
than a warning.  Therefore avoiding such fields is necessary for archive
portability.

Suggested-by: Tim Kientzle <tim@kientzle.com>
2011-04-07 08:27:56 -04:00
KWSys Robot c2f8a13715 KWSys Nightly Date Stamp 2011-04-07 00:12:22 -04:00
KWSys Robot 6d7e4d4043 KWSys Nightly Date Stamp 2011-04-06 00:12:33 -04:00
Brad King b7b9597b75 Merge topic 'drag-n-drop-components'
dd04608 Fix KWStyle warnings
2973c1f Add component support to DragNDrop generator.
2011-04-05 14:29:06 -04:00
Brad King c90fa7c00c Merge topic 'cpack-grouping-enum'
9c43824 Fix KWStyle warnings
64a5e20 Combine component packaging methods into an enum.
2011-04-05 14:28:59 -04:00
Brad King e560bf4ba3 Merge topic 'fix_vs10_object_files'
9a6ff95 Fix for bug where VS2010 did not use .obj files as part of the build.
2011-04-05 14:28:55 -04:00
Brad King fff3a742b2 Merge topic 'upload-built-files'
3e32db7 cmCTestUploadCommand::CheckArgumentKeyword should return false if not FILES
6b6f309 Add the FILES keyword to ctest_upload command
28cdd0a Don't tar/gz ctest_upload() files
fbe4356 Change 'Files' tag to 'Upload' in Upload.xml
350546d Implement ctest_upload command
2011-04-05 14:28:38 -04:00
KWSys Robot 0460916752 KWSys Nightly Date Stamp 2011-04-05 00:13:05 -04:00
Eric NOULARD 9c43824066 Fix KWStyle warnings 2011-04-04 14:59:58 -04:00
KWSys Robot f859249dca KWSys Nightly Date Stamp 2011-04-04 00:13:07 -04:00
KWSys Robot 4ccb44e7c5 KWSys Nightly Date Stamp 2011-04-02 00:13:02 -04:00
Bill Hoffman 9a6ff95072 Fix for bug where VS2010 did not use .obj files as part of the build.
For VS2010 if a precompiled .obj file was the output of a custom commad,
it was used as part of the build.  If it was not, then VS did not
use it as part of the build.  This commit updates the test to check
for this issue, and fixes the problem. This fixes bugs #0011891 and
2011-04-01 16:28:41 -04:00
Eric NOULARD dd04608132 Fix KWStyle warnings 2011-04-01 19:27:34 +02:00
KWSys Robot 0315d3b66f KWSys Nightly Date Stamp 2011-04-01 00:12:02 -04:00
Zach Mullen 3e32db7921 cmCTestUploadCommand::CheckArgumentKeyword should return false if not FILES 2011-03-31 14:41:19 -04:00
Clinton Stimpson 2973c1fbeb Add component support to DragNDrop generator. 2011-03-31 13:33:10 -04:00
Clinton Stimpson 64a5e20999 Combine component packaging methods into an enum.
Also allow generators to override the default packaging method.
Add a ONE_PER_GROUP option so that method can be specified by the user without relying on defaults.
2011-03-31 13:33:03 -04:00
Brad King 148b528f9d Merge topic 'custom-command-slashes'
1286050 Normalize slashes of add_custom_(command|target) DEPENDS (#11973)
2011-03-31 13:23:32 -04:00
Brad King ecc81cd353 Merge topic 'fix_long_filenames_vs2010'
945f2c2 With very long file names, VS 2010 was unable to compile files.
2011-03-31 13:23:23 -04:00
Brad King 0506e37499 Merge topic 'cleanup-unused-variable-check'
a4335a6 Fix unused cache warning after multiple configure iterations
a75ebe3 Refine unused cache variable warning
2011-03-31 13:22:54 -04:00
Brad King 3c7c1f07a0 Merge topic 'CPack-fix11930-LeftOverComponents'
6dfc818 CPack fix #11930 and simplifies component packaging options
2011-03-31 13:22:48 -04:00
Brad King bfa1f0931a Merge topic 'doc-include_directories-typo-issue-12020'
84b7d92 Fix typo in include_directories documentation (#12020)
2011-03-31 13:22:32 -04:00
Brad King 86f711b9b7 Merge topic 'generator-expression-dot-in-name-issue-12002'
08428ba Allow '.' in target names in generator expressions (#12002)
2011-03-31 13:22:23 -04:00
KWSys Robot 4fd2a992b8 KWSys Nightly Date Stamp 2011-03-31 00:13:03 -04:00
Brad King 128605054a Normalize slashes of add_custom_(command|target) DEPENDS (#11973)
All commands accepting file paths should normalize the slashes so that
the string-represented names can be compared reliably.  The commands
add_library and add_executable have done this for years.  We taught
add_custom_command to normalize its OUTPUT names in commit a75a0a14
(Normalize add_custom_command OUTPUT names, 2010-12-15).  We handled a
special case of the DEPENDS option in commit 7befc007 (Handle trailing
slashes on add_custom_command DEPENDS, 2011-01-26).

Teach both add_custom_command and add_custom_target to normalize slashes
of DEPENDS files up front.  This approach subsumes the above-mentioned
special case so remove the one line added for it but keep its test.
Extend the CustomCommand test to check that slash count mismatches
between custom command OUTPUT and DEPENDS can still be linked correctly.
2011-03-30 09:52:07 -04:00
KWSys Robot 23e8306e7f KWSys Nightly Date Stamp 2011-03-30 00:12:15 -04:00
Brad King 72dd36e628 KWSys: Recognize rxvt-unicode-256color terminal (#12013)
Author: Matti Niemenmaa
2011-03-29 17:40:03 -04:00
Brad King 84b7d928fe Fix typo in include_directories documentation (#12020)
A search-and-replace in commit 8d32d229 (make commands lower case by
default, 2007-10-10) accidentally changed the variable reference
CMAKE_INCLUDE_DIRECTORIES_BEFORE to CMAKE_include_directories_BEFORE.
Change it back.
2011-03-29 15:55:22 -04:00
KWSys Robot ffae462ae6 KWSys Nightly Date Stamp 2011-03-29 00:12:42 -04:00
KWSys Robot 0e66141bea KWSys Nightly Date Stamp 2011-03-28 00:13:04 -04:00
KWSys Robot 3a21e4d621 KWSys Nightly Date Stamp 2011-03-27 00:13:03 -04:00
KWSys Robot a95540df84 KWSys Nightly Date Stamp 2011-03-26 00:13:02 -04:00
KWSys Robot 9b6e16f031 KWSys Nightly Date Stamp 2011-03-25 00:12:40 -04:00
Brad King a4335a621e Fix unused cache warning after multiple configure iterations
The curses dialog (ccmake) allows variables to be specified on the
command line.  If any of these variables is used during any configure
iteration or during generate we must not warn about it.

The Qt dialog (cmake-gui) allows variables to be added and removed in
the GUI interactively.  If a variable is added, removed, and then added
again we must still warn if it is unused.
2011-03-24 09:45:33 -04:00
Brad King a75ebe3ea4 Refine unused cache variable warning
List all unused variables in one warning.  Cleanup implementation to run
the check exactly once at the end of generation.
2011-03-24 09:45:33 -04:00
KWSys Robot eee9f74d4e KWSys Nightly Date Stamp 2011-03-24 00:13:04 -04:00
Brad King 29487bacea KWSys: Do not trust EXECUTABLE_OUTPUT_PATH for ProcessFwd9x encoding
Set target property RUNTIME_OUTPUT_DIRECTORY explicitly on ProcessFwd9x
and EncodeExecutable so that we know exactly where the executables will
exist on disk.
2011-03-23 17:20:04 -04:00
Bill Hoffman 945f2c2214 With very long file names, VS 2010 was unable to compile files.
At some point in the past VS 2010 failed some tests with custom commands when
relative paths were not used.  It seems that those problems have been fixed.
However, the relative paths apparently are appended to the current working
directoy before vs accesses the file. So, with a long path, relative paths
cause it to create a combined path that is too long.
2011-03-23 15:06:44 -04:00
Eric NOULARD 6dfc818394 CPack fix #11930 and simplifies component packaging options 2011-03-23 18:28:05 +01:00
KWSys Robot 7afcb81037 KWSys Nightly Date Stamp 2011-03-23 00:12:06 -04:00
Brad King 08428ba38a Allow '.' in target names in generator expressions (#12002)
Simply add this character to the allowed list in the regular expression
used to parse generator expression components.
2011-03-22 16:26:20 -04:00
Brad King 49a3fa18aa Merge topic 'CPackDeb-fixTestCrash'
21007f8 CPack fix CPackDeb crash when CPackDeb.cmake ends with a FATAL_ERROR
2011-03-22 14:45:47 -04:00
Brad King 1c3233a850 Merge topic 'include-flags-response-file'
86cb17b Pass include directories with response files to GNU on Windows
9a0b9bc Optionally pass include directories with response files
6e8a67f Generate target-wide flags before individual build rules
d099546 Factor old-style -D flags out from -I flag generation
2011-03-22 14:45:44 -04:00
Brad King bc19ba6032 Merge topic 'ctest-detect-maven-errors-and-warnings'
fcf3208 CTest: catch warning output of Apache Maven
2011-03-22 14:45:34 -04:00
KWSys Robot 935662a5eb KWSys Nightly Date Stamp 2011-03-22 00:13:04 -04:00
KWSys Robot d726a3610f KWSys Nightly Date Stamp 2011-03-21 00:12:13 -04:00
KWSys Robot e1eed25949 KWSys Nightly Date Stamp 2011-03-20 00:12:11 -04:00
Eric NOULARD 21007f8989 CPack fix CPackDeb crash when CPackDeb.cmake ends with a FATAL_ERROR 2011-03-19 11:12:31 +01:00
KWSys Robot a885fa23a4 KWSys Nightly Date Stamp 2011-03-19 00:13:03 -04:00
Rolf Eike Beer fcf3208ac1 CTest: catch warning output of Apache Maven
Some samples of things that got unnoticed by our nightly builds:

$ JAVA_HOME= mvn
Warning: JAVA_HOME environment variable is not set.
...

$ mvn
[INFO] Scanning for projects...
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD FAILURE
...
2011-03-18 09:08:33 -04:00
KWSys Robot 96453cea6a KWSys Nightly Date Stamp 2011-03-18 00:13:01 -04:00
Brad King 9a0b9bc8b7 Optionally pass include directories with response files
Create platform option CMAKE_<lang>_USE_RESPONSE_FILE_FOR_INCLUDES to
enable use of response files for passing the list of include directories
to compiler command lines.
2011-03-17 17:56:13 -04:00
Brad King 6e8a67f99a Generate target-wide flags before individual build rules
This switches the internal generation order but does not affect the
results.  The new order ensures that any internal state changed by
generating target-wide flags is known when the individual rules that use
those flags are generated.
2011-03-17 15:21:59 -04:00
KWSys Robot ac9f50e091 KWSys Nightly Date Stamp 2011-03-17 00:13:03 -04:00
KWSys Robot 6ab5166ff8 KWSys Nightly Date Stamp 2011-03-16 00:12:12 -04:00
Zach Mullen 6b6f309c5f Add the FILES keyword to ctest_upload command 2011-03-15 15:07:37 -04:00
Zach Mullen 28cdd0a5be Don't tar/gz ctest_upload() files 2011-03-15 15:07:37 -04:00
Zach Mullen fbe435652d Change 'Files' tag to 'Upload' in Upload.xml 2011-03-15 15:07:37 -04:00
Zach Mullen 350546db3a Implement ctest_upload command 2011-03-15 15:07:37 -04:00
Brad King 0554e5e50f Merge topic 'ctest-remove-trailing-whitespace'
a1711f1 Remove trailing whitespace
2011-03-15 14:47:57 -04:00
Brad King c7278633a7 Merge topic 'validate-custom-commands-issue-11963'
339d592 Validate custom command arguments (#11963)
2011-03-15 14:47:51 -04:00
Brad King 3b6dbf7114 Merge topic 'module-link-interface-issue-11945'
c9d55ae Add parens in cmTarget::ComputeLinkInterface logic
c6a8e4c The link interface of MODULE libraries is empty (#11945)
2011-03-15 14:47:42 -04:00
Brad King 0e4b5caa81 Merge topic 'CPackDeb-ComponentSupport'
bf7066c CPackDeb  add Component Support to DEB generator fix #0011655
2011-03-15 14:47:35 -04:00
Brad King d69220fb48 Merge topic 'MakeUseMangledMesaScriptable'
968d5a0 Make use_mangled_mesa() available in cmake script mode (#11926)
1a91ac4 Remove trailing whitespace
2011-03-15 14:47:22 -04:00
Brad King a4219aa435 Merge topic 'ctest-git-submodule-recursive'
732af7f CTest: Do not fail with submodules and Git < 1.6.5.0
1173cc4 CTest: Update Git submodules with --recursive
2011-03-15 14:47:14 -04:00
Brad King d099546450 Factor old-style -D flags out from -I flag generation
Move the GetDefineFlags call from cmLocalGenerator::GetIncludeFlags to
all call sites so that the method exclusively constructs a string of
include search path flags.
2011-03-15 13:09:06 -04:00
KWSys Robot 1500dc6d43 KWSys Nightly Date Stamp 2011-03-15 00:13:04 -04:00
Brad King 339d5922d9 Validate custom command arguments (#11963)
Reject quoted commands immediately with an error message instead of
allowing a later assertion failure.
2011-03-14 17:49:30 -04:00
Brad King c9d55ae5b9 Add parens in cmTarget::ComputeLinkInterface logic
Avoid GCC warning

  warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]

added by commit c6a8e4c7 (The link interface of MODULE libraries is
empty, 2011-03-09).
2011-03-14 15:34:26 -04:00
KWSys Robot 5c6a7bdbf2 KWSys Nightly Date Stamp 2011-03-14 00:12:19 -04:00
KWSys Robot e5d85efef1 KWSys Nightly Date Stamp 2011-03-13 00:13:02 -05:00
KWSys Robot 22825b2b06 KWSys Nightly Date Stamp 2011-03-12 00:13:08 -05:00
Brad King a1711f1c6b Remove trailing whitespace 2011-03-11 08:04:58 -05:00
M. Konrad bf7066c6ce CPackDeb add Component Support to DEB generator fix #0011655
Contribution by Martin Konrad
Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
2011-03-11 08:47:15 +01:00
KWSys Robot 8a16bdde05 KWSys Nightly Date Stamp 2011-03-11 00:12:13 -05:00
Alex Neundorf 968d5a0ff1 Make use_mangled_mesa() available in cmake script mode (#11926)
There is nothing in it which speaks against this.

Alex
2011-03-10 21:44:02 +01:00
Alex Neundorf 1a91ac4d0d Remove trailing whitespace
Alex
2011-03-10 21:43:02 +01:00
Brad King 732af7fbba CTest: Do not fail with submodules and Git < 1.6.5.0
Several major Linux distributions still do not provide Git >= 1.6.5.0 in
their stable package lists.  Prior to commit 1173cc4a (Update Git
submodules with --recursive, 2011-02-22) CTest was able to use older Git
versions but simply silently failed to update submodules recursively.
Instead of failing with older Git versions preserve the status quo and
add a warning in the update log.  Users testing projects with recursive
submodules may simply update to a Git new enough to support them.
2011-03-10 13:57:30 -05:00
KWSys Robot 8def3f5949 KWSys Nightly Date Stamp 2011-03-10 00:12:12 -05:00
Brad King c6a8e4c71a The link interface of MODULE libraries is empty (#11945)
MODULE libraries cannot be linked into other libraries and executables
(just like executables without ENABLE_EXPORTS).  Set the MODULE target
link interface to be empty.  This allows such targets to be installed in
an EXPORT set without including all their private implementation
dependencies.
2011-03-09 09:52:46 -05:00
KWSys Robot fc3eb139c9 KWSys Nightly Date Stamp 2011-03-09 00:13:04 -05:00
Brad King ba14c92254 Merge topic 'CPack-MoreRobustComponentFileList'
b813f86 CPack  fix compile error on VS70 and avoid KWStyle warnings
77333a9 CPack  more robust way to collect files belonging to a component
2011-03-08 14:22:32 -05:00
Brad King 9c1344f33b Merge topic 'CPackArchive-PackageOrphanComponents'
fe530ff CPackArchive package all components specified in CPACK_COMPONENTS_ALL
2011-03-08 14:22:24 -05:00
Brad King 27b41deaed Merge topic 'link-static'
077954d Test static linking with LINK_SEARCH_START_STATIC
5abfb57 Add target property LINK_SEARCH_START_STATIC to aid static linking
2011-03-08 14:22:20 -05:00
KWSys Robot be9af61f72 KWSys Nightly Date Stamp 2011-03-08 00:10:31 -05:00
KWSys Robot e927777461 KWSys Nightly Date Stamp 2011-03-07 00:12:20 -05:00
KWSys Robot 4586809156 KWSys Nightly Date Stamp 2011-03-06 00:13:02 -05:00
KWSys Robot 278bf6f29a KWSys Nightly Date Stamp 2011-03-05 00:13:04 -05:00
Eric NOULARD b813f863e6 CPack fix compile error on VS70 and avoid KWStyle warnings 2011-03-04 22:57:37 +01:00
KWSys Robot ed1cd2daf6 KWSys Nightly Date Stamp 2011-03-04 00:12:14 -05:00
Brad King 5abfb57184 Add target property LINK_SEARCH_START_STATIC to aid static linking
Commit afd7d4ca (Add target property LINK_SEARCH_END_STATIC, 2008-01-31)
defined a property to ensure that static runtime libraries get selected.
Add a property to specify that all libraries whose type is unknown, such
as "-lm", should be assumed static.  Furthermore it assumes that an
option such as "-static" is also used so that no initial -Bstatic is
needed.
2011-03-03 17:12:32 -05:00
Eric NOULARD 77333a92c2 CPack more robust way to collect files belonging to a component 2011-03-03 22:43:31 +01:00
Eric NOULARD fe530ff5e9 CPackArchive package all components specified in CPACK_COMPONENTS_ALL
When asking for group packaging the components not belonging to
any group should be packaged separately.
2011-03-03 21:19:13 +01:00
KWSys Robot cbb5ae60be KWSys Nightly Date Stamp 2011-03-03 00:12:15 -05:00
KWSys Robot f72cc88c65 KWSys Nightly Date Stamp 2011-03-02 00:12:13 -05:00
Brad King 32f18c94e1 KWSys: Require at least CMake 2.6.3
Remove code left for supporting earlier CMake versions.
2011-03-01 15:40:03 -05:00
Brad King 9a7c6a3cc4 Merge topic 'require-cmake-2.6.3'
c3e452e Require at least CMake 2.6.3 to build current CMake
2011-03-01 15:30:38 -05:00
Brad King bb745612bc Merge topic 'doc-typo-fixes'
7c5e412 Documentation: Fix a few typos (#11883)
2011-03-01 15:30:32 -05:00
Brad King 1eca67e12d Merge topic 'fix-11286-add-file-upload'
61a83f9 Fix KWStyle line too long error (#11286)
963bebc Implement file(UPLOAD (#11286)
2011-03-01 15:30:28 -05:00
Brad King b5b4aa2f71 Merge topic 'CPack-ChangeComponentNamingScheme'
3fb89cf CPack remove previously CPack generated files (if any) before running CPack
f2ab270 CPack  fix KWStyle warning
4deb308 CPack Authorize DISPLAY_NAME usage in component package
8c450f6 CPack remove "-ALL" suffix for ALL-IN-ONE packages
2011-03-01 15:30:14 -05:00
Brad King c55ce31c6e Merge topic 'CPackRPM-AvoidSpaceInName-Fixbug9932'
5b4cbdb CPackRPM Replace space in some CPACK_ vars (Fix bug 9932)
2011-03-01 15:30:10 -05:00
Brad King c34b0eac25 Merge topic 'EclipseLinkedResourcesToSubProjects2'
e8a97e0 Eclipse projects: created one linked resource for each subproject
2011-03-01 15:30:05 -05:00
KWSys Robot 26b9dfb722 KWSys Nightly Date Stamp 2011-03-01 00:11:00 -05:00
David Cole 61a83f955a Fix KWStyle line too long error (#11286) 2011-02-28 10:47:23 -05:00
KWSys Robot 2465b5e4f5 KWSys Nightly Date Stamp 2011-02-28 00:12:10 -05:00
KWSys Robot ab02be50b4 KWSys Nightly Date Stamp 2011-02-27 00:12:12 -05:00
KWSys Robot 2f690ab8cb KWSys Nightly Date Stamp 2011-02-26 00:10:08 -05:00
David Cole 963bebcc17 Implement file(UPLOAD (#11286)
Including documentation and testing, of course.
2011-02-25 17:26:34 -05:00
Eric NOULARD 5b4cbdb45e CPackRPM Replace space in some CPACK_ vars (Fix bug 9932) 2011-02-25 16:47:11 +01:00
KWSys Robot aa1ab6441b KWSys Nightly Date Stamp 2011-02-25 00:12:14 -05:00
Brad King c3e452e944 Require at least CMake 2.6.3 to build current CMake
Remove some cruft left for supporting builds with CMake 2.4.
2011-02-24 15:14:08 -05:00
KWSys Robot a9841e6e9a KWSys Nightly Date Stamp 2011-02-24 00:12:13 -05:00
Eric NOULARD f2ab270e6f CPack fix KWStyle warning 2011-02-24 00:29:25 +01:00
KWSys Robot fe449843b7 KWSys Nightly Date Stamp 2011-02-23 00:11:47 -05:00
Eric NOULARD 4deb308e82 CPack Authorize DISPLAY_NAME usage in component package
Second (last) part fix of feature request #11814
2011-02-22 23:49:49 +01:00
Modestas Vainius 7c5e412c4a Documentation: Fix a few typos (#11883)
W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 10029: warning [p 158, 13.5i]: can't break line
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz informations information
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz dependant dependent
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz prefered preferred
I: cmake: spelling-error-in-binary ./usr/bin/cmake prefered preferred
I: cmake: spelling-error-in-binary ./usr/bin/cpack prefered preferred
I: cmake: spelling-error-in-binary ./usr/bin/ctest prefered preferred
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakepolicies.1.gz prefered preferred
I: cmake-curses-gui: spelling-error-in-binary ./usr/bin/ccmake prefered preferred
I: cmake-qt-gui: spelling-error-in-binary ./usr/bin/cmake-gui prefered preferred
2011-02-22 17:24:51 -05:00
Eric NOULARD 8c450f6287 CPack remove "-ALL" suffix for ALL-IN-ONE packages
First part fix of feature request 11814
2011-02-22 22:56:26 +01:00
Brad King 1173cc4ab2 CTest: Update Git submodules with --recursive
Fail if submodules exist and the git version is less than 1.6.5.0.

Inspired-by: Johan Björk <phb@spotify.com>
2011-02-22 15:47:50 -05:00
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 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 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 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
KWSys Robot 73bbef36d0 KWSys Nightly Date Stamp 2011-02-22 00:10:58 -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
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
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 d02519e974 Merge topic 'doc-MSVC_VERSION-issue-11833'
5cdd05b Fix documentation of MSVC_VERSION (#11833)
2011-02-14 16:34:29 -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
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
Brad King 5cdd05bc68 Fix documentation of MSVC_VERSION (#11833)
Previously the example version number was wrong.  Instead list all the
known versions with correct numbers.
2011-02-10 08:20:33 -05:00
KWSys Robot e53b7cbadf KWSys Nightly Date Stamp 2011-02-10 00:12:13 -05:00
Marco Craveiro 6e02a3b2bf CTest: Use the gcov --preserve-paths flag (#11717)
To avoid name clashes.

Before this commit, name clashes can occur when invoking gcov on a
project that uses the same file name in different directories. The
--preserve-paths flag ensures all file names have a complete path,
avoiding name clashes.
2011-02-09 16:04:15 -05:00
David Cole 667cf5b963 Make file DOWNLOAD less noisy (#11761)
Thanks to Daniel Nelson for the suggestion and the patch.
2011-02-09 13:22:32 -05:00
David Cole fbca267331 VS: Only use /MANIFEST if hasManifest is true (#11216)
Thanks to Jrg Riedel for the patch.
2011-02-09 13:01:31 -05:00
David Cole 98b448ee9e VS2010: Fixed GenerateManifest flag (#10704)
Thanks to "McBen <viertelvor12@gmx.net>" for the patch.

(Did not preserve original commit author information because
we have a push check for first and last name, and do not
accept authors with only an alias...)
2011-02-09 13:01:19 -05:00
Brad King 85163fba18 Add link flag table entries for VS 7,8,9
Map the following MS linker flags:

  /CLRUNMANAGEDCODECHECK
  /CLRUNMANAGEDCODECHECK:NO
  /DELAY:UNLOAD
  /DELAYSIGN
  /DELAYSIGN:NO
  /DYNAMICBASE
  /DYNAMICBASE:NO
  /NOASSEMBLY
  /NOENTRY
  /NXCOMPAT
  /NXCOMPAT:NO
  /RELEASE
2011-02-09 09:05:07 -05:00
KWSys Robot 7258b0674c KWSys Nightly Date Stamp 2011-02-09 00:12:08 -05:00
Brad King 7f87205161 Merge topic 'FixCrashInGraphVizWriter'
00e7ea7 Fix crash in GraphVizWriter when GRAPHVIZ_TARGET_IGNORE_REGEX is used
2011-02-08 14:18:48 -05:00
Brad King 5b8869faea Merge topic 'fix-clang-warnings'
c310450 Silence the may be used uninitialized warnings: initialize stuff.
2011-02-08 14:18:36 -05:00
KWSys Robot 68c004aa11 KWSys Nightly Date Stamp 2011-02-08 00:12:07 -05:00