Commit Graph

16361 Commits

Author SHA1 Message Date
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 cddbe63d79 Merge topic 'fix12006-brokenPackageName'
33391c6 CPackDeb: Fix #12006 broken package names
2011-03-31 13:23:16 -04:00
Brad King 62130ba9c4 Merge topic 'gnu-install-dirs-issue-3976'
c2bf48e GNUInstallDirs: Propagate DATAROOTDIR changes to dependent defaults
11431c6 GNUInstallDirs: Simplify and clarify documentation
a262fe0 Add GNUInstallDirs module to define GNU layout (#3976)
2011-03-31 13:23:07 -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 e54e38fadf Merge topic 'fix-FortranCInterface-for-Cray-7.3.2'
d0203fb FortranCInterface: Fix mangling detection with Cray Fortran >= 7.3.2
2011-03-31 13:22:38 -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 d0203fb567 FortranCInterface: Fix mangling detection with Cray Fortran >= 7.3.2
The Cray Fortran compiler started using module init symbols in version 7.3.2.
Starting in commit 71287734 (Teach FortranC interface for Intel, PGI, and gcc
4.2, 2009-08-05) we provide C versions of the module init symbols so that the
detection executable can link when the C versions of the module-mangled symbols
are picked up.

If no C module-mangled symbol matches then we cannot let the C module init
symbol appear because it will be duplicated by the Fortran copy that provides
the module-mangled symbol.  This was first handled for the PathScale compiler
in commit 21faaa5d (FortranCInterface: Fix PathScale detection, 2010-01-22) and
commit 46858720 (FortranCInterface: Fix PathScale detection again, 2010-02-16).
Handle it now for the Cray compiler too.
2011-03-24 16:06:58 -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
Martin Konrad 33391c697f CPackDeb: Fix #12006 broken package names
Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
2011-03-24 09:25:58 +01: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
Brad King c2bf48ef57 GNUInstallDirs: Propagate DATAROOTDIR changes to dependent defaults 2011-03-23 14:39:05 -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 4344e83fcf Merge topic 'asn_check_proto'
93c56a7 Tests: Added test for check_prototype_definition.
4f252ab Modules: Added CheckPrototypeDefinition module.
2011-03-22 14:45:51 -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 685d893500 Merge topic 'fix-Java-test-enable-logic'
80ccc9a Disable Java test with Xcode generator
46c0a58 Enable Java test more carefully on Apple
2011-03-22 14:45:38 -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
Brad King 3ae23330ee Merge topic 'FindBLAS-acml-search-improvement'
ac475c4 ACML search improvement
2011-03-22 14:45:30 -04:00
Brad King e1f0852a8c Merge topic 'add-ProcessorCount-module'
e6c2701 ProcessorCount: Use ERROR_QUIET with execute_process (#11302)
4dd2ec2 ProcessorCount: Test fails if count is 0 (#11302)
6dd74d5 ProcessorCount: Add support for remaining platforms (#11302)
c159836 ProcessorCount test: more output, do not fail. (#11302)
6259bc4 Compare ProcessorCount to SystemInformation count. (#11302)
3430955 Add ProcessorCount support for QNX via pidin. (#11302)
4d6418f If getconf returns empty output, try cpuinfo. (#11302)
9cc8ad9 Add correct module notice header.
abbaa12 Add module ProcessorCount.cmake (#11302)
2011-03-22 14:45:25 -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
David Cole e6c2701002 ProcessorCount: Use ERROR_QUIET with execute_process (#11302)
Also, comment out all "debugging" calls to message() that helped
us interpret the output on other platforms when running on the
dashboard clients.

Using ERROR_QUIET avoids unnecessary stderr output while calling
external tools to determine the processor count. If there's an
error parsing the output, we set the count to 0 anyhow.

Also, the test will fail on a CMake dashboard run if the count
comes back equal to 0.

Now that the code is "done"-ish, remove the debugging output.
Expect no output on stdout or stderr when calling the
ProcessorCount function from now on.
2011-03-18 14:28:24 -04:00
Brad King 80ccc9aafb Disable Java test with Xcode generator
The parent commit 46c0a583 (Enable Java test more carefully on Apple,
2011-03-18) failed to restore the exclusion of Xcode when enabling the
Java test that was originally removed by commit c8f39193 (Avoid problem
reading jni.h on Macs, 2010-10-25).  The Xcode generator does not work
with the current Java support at all.
2011-03-18 14:18:11 -04:00
Andreas Schneider 93c56a7040 Tests: Added test for check_prototype_definition. 2011-03-18 14:03:37 -04:00
Andreas Schneider 4f252abea5 Modules: Added CheckPrototypeDefinition module.
This check if the function exists and the prototype we want to use is
correct. There are still functions which have different prototypes on
different UNIX systems.
2011-03-18 14:03:35 -04:00
Brad King 46c0a5832d Enable Java test more carefully on Apple
The CTEST_RUN_Java option added by commit c8f39193 (Avoid problem
reading jni.h on Macs, 2010-10-25) was a quick hack to disable the Java
test on Mac machines after an update from Apple created a broken jni.h
symlink.  Remove the option and instead test whether jni.h exists as a
readable file before reading it.  This restores the original Java test
enabling logic but makes it robust to the broken symlink.
2011-03-18 13:46:57 -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 86cb17b18d Pass include directories with response files to GNU on Windows
The GNU 4.x toolchain on MinGW (and therefore MSYS) allows compiler
options to be passed via response files.  Use this to pass include
directory -I options.  This allows the include file search path to be
very long despite shell and mingw32-make command line length limits.
2011-03-17 17:56:14 -04:00