Commit Graph

11750 Commits

Author SHA1 Message Date
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