Commit Graph

12035 Commits

Author SHA1 Message Date
Peter Collingbourne 5b114c9bee Introduce a cmLocalGenerator::ConvertToIncludeReference function
This provides a mechanism for the local generator to override how
header search paths are generated.
2011-10-02 18:30:43 +01:00
Peter Collingbourne 903d914b28 Make cmLocalGenerator::ConvertToLinkReference virtual
This provides a mechanism for the local generator to override how
library search paths are generated.
2011-10-02 18:30:43 +01:00
Nicolas Despres 8a0eb78f3b Constify many getters of cmGlobalGenerator. 2011-10-02 18:30:42 +01:00
Nicolas Despres 4532d36cc9 Add const versions of some getters. 2011-10-02 18:30:42 +01:00
Nicolas Despres 3db2973bd2 Refactor TargetTypeNames.
Make it a static method instead of an array. It is safer for the
type checking and if we add a new target type we will be warned to add
a case to the switch.
2011-10-02 18:30:42 +01:00
KWSys Robot 18c0aa0db7 KWSys Nightly Date Stamp 2011-10-02 00:09:44 -04:00
Alex Neundorf 3df49dc7b1 fix #12392: handle CMAKE_CXX_COMPILER_ARG1 for Eclipse projects
CMAKE_CXX/C_COMPILER_ARG1 have to be used for finding the include
dirs and builtin macros, so Eclipse can do code completion

Alex
2011-10-01 19:09:24 +02:00
KWSys Robot 867b226898 KWSys Nightly Date Stamp 2011-10-01 00:09:52 -04:00
Bill Hoffman 8f1ee5181d Also, check for 11.x as an intel fortran version.
As Dave Cole pointed out the previous commit only checked for 10.x and 12.x.
11.0 was accounted for, but 11.1, 11.2 and 11.3 were not.  This patch
should make it work for those versions as well.  I did a web check and there
are 11.0, 11.1, 11.2 and 11.3 versions from Intel. I assume if 12.x uses
11.0 as the version in the .vfproj file, then all of the 11.x versions would
as well.
2011-09-30 17:11:34 -04:00
David Cole c4e08b5533 Merge topic 'ImproveFindPackageModeWithTryCompile'
f15945e Use makefile->IssueMessage() for better error messages
c886e31 Improve behaviour of --find-package mode with try_run/try_compile
31f43fd Remove trailing whitespace
2011-09-30 15:57:20 -04:00
David Cole 449aef3efb Merge topic 'vs11-generator'
3b5256e Teach our tests about special cases for VS 11
3d5632e Add Visual Studio 11 generator for x86 and x64 tools
2011-09-30 15:57:17 -04:00
Bill Hoffman 0cd3606afd Use version 11.0 for 12.x and 9.10 for 10.x intel versions to fix 12.1 vsIDE.
The intel compiler for 12.0 and 12.1 are known to expect the file version
to be 11.0 in the .vfproj file.  For 10.x it should be 9.10.  Prior to
this fix 12.0 and 10.1 were the only values checked. If those did not match
the actual version of intel was put in the vfproj file causing an error
about future version load attempt in the IDE.
2011-09-30 15:52:37 -04:00
KWSys Robot 72bac428cc KWSys Nightly Date Stamp 2011-09-30 00:09:34 -04:00
KWSys Robot 8a3bca50fa KWSys Nightly Date Stamp 2011-09-29 00:07:38 -04:00
KWSys Robot ef8cc9997c KWSys Nightly Date Stamp 2011-09-28 00:09:40 -04:00
Alex Neundorf f15945edad Use makefile->IssueMessage() for better error messages
Alex
2011-09-27 18:59:42 +02:00
KWSys Robot 77593178cf KWSys Nightly Date Stamp 2011-09-27 00:09:39 -04:00
Brad King 26f079044d Merge topic 'doc-set_target_properties-typo'
f8c77fa Fix typo in set_target_properties' documentation.
2011-09-26 11:24:39 -04:00
KWSys Robot 0bf12af36c KWSys Nightly Date Stamp 2011-09-26 00:09:04 -04:00
KWSys Robot 9584135674 KWSys Nightly Date Stamp 2011-09-25 00:09:58 -04:00
KWSys Robot e4bd3b0cf3 KWSys Nightly Date Stamp 2011-09-24 00:09:49 -04:00
Brad King b0cd630521 Refactor find_* command final path list computation
All find_* commands re-root the list of paths and then add trailing
slashes.  Factor this pair of calls out into a dedicated method.  The
new method would be the only caller to AddTrailingSlashes, so subsume
that method into it.
2011-09-23 14:36:27 -04:00
Brad King 3d5632ed59 Add Visual Studio 11 generator for x86 and x64 tools 2011-09-23 10:10:01 -04:00
Raphael Kubo da Costa f8c77fa97b Fix typo in set_target_properties' documentation.
our -> or
2011-09-23 08:16:08 -04:00
KWSys Robot 8c280435df KWSys Nightly Date Stamp 2011-09-23 00:09:39 -04:00
KWSys Robot 4a1aadbb00 KWSys Nightly Date Stamp 2011-09-22 00:09:30 -04:00
David Cole 682a989fdb Merge topic 'CPackDeb-fakeroot'
49da3bd CPackDeb fix #10325 automagically use fakeroot for DEB if fakeroot is found
2011-09-21 17:29:16 -04:00
KWSys Robot 41c6b3dd4d KWSys Nightly Date Stamp 2011-09-21 00:09:39 -04:00
David Cole 47dac7ec97 Merge topic 'file-download-http-error'
09817e9 Make file(DOWNLOAD) fail on http error
2011-09-20 14:42:26 -04:00
KWSys Robot 400c74f325 KWSys Nightly Date Stamp 2011-09-20 00:14:11 -04:00
Brad King 09817e91f9 Make file(DOWNLOAD) fail on http error
If a http server responds with a result code greater than 400 then the
data returned from the download probably do not match that expected.
Teach file(DOWNLOAD) to fail with an error in this case instead of
silently pretending that the download worked.  The file(UPLOAD) command
already does this.
2011-09-19 17:41:48 -04:00
KWSys Robot cfc6e01851 KWSys Nightly Date Stamp 2011-09-19 00:14:09 -04:00
KWSys Robot f1cd7d289e KWSys Nightly Date Stamp 2011-09-18 00:13:12 -04:00
KWSys Robot 962a54db5f KWSys Nightly Date Stamp 2011-09-17 00:14:04 -04:00
KWSys Robot 7fca32a0bb KWSys Nightly Date Stamp 2011-09-16 00:14:06 -04:00
Alex Neundorf c886e312bb Improve behaviour of --find-package mode with try_run/try_compile
Instead of failing with an error message which says things have not been
setup correctly, it now says that try_compile/try_run() are not
supported in find_package mode (#12426).

Alex
2011-09-15 16:28:35 +02:00
Alex Neundorf 31f43fdb5a Remove trailing whitespace
Alex
2011-09-15 16:20:33 +02:00
KWSys Robot ec0f23515f KWSys Nightly Date Stamp 2011-09-15 00:14:07 -04:00
KWSys Robot 2a3441b65f KWSys Nightly Date Stamp 2011-09-14 00:14:04 -04:00
David Cole 98d5623a7b Merge topic 'effective-platform-name'
64c9b31 Xcode: Add test to demonstrate iOS project in Xcode
59a2265 Xcode: Use EFFECTIVE_PLATFORM_NAME reference in ComputeOutputDir
2011-09-13 14:33:21 -04:00
KWSys Robot c7021203de KWSys Nightly Date Stamp 2011-09-13 00:13:05 -04:00
David Cole 59a2265576 Xcode: Use EFFECTIVE_PLATFORM_NAME reference in ComputeOutputDir
Caveats apply: only valid when not overriding default value for output
dir *and* there is a CMAKE_XCODE_EFFECTIVE_PLATFORMS value.

For now, CMAKE_XCODE_EFFECTIVE_PLATFORMS must be defined in each
project, or in the cache for a build.

Code relying on value of LOCATION and similar properties may not
work if it depends on file existence on disk since CMake will not
evaluate $(EFFECTIVE_PLATFORM_NAME). This feature is only enabled
for making it easier to build Xcode iOS projects where the developer
wants to be able to switch easily between simulator and device builds.
2011-09-12 15:21:00 -04:00
KWSys Robot 201173133c KWSys Nightly Date Stamp 2011-09-12 00:10:18 -04:00
KWSys Robot 39d5c49f21 KWSys Nightly Date Stamp 2011-09-11 00:14:12 -04:00
KWSys Robot e27a0e9870 KWSys Nightly Date Stamp 2011-09-10 00:14:05 -04:00
KWSys Robot 3ae6060f29 KWSys Nightly Date Stamp 2011-09-09 00:14:04 -04:00
KWSys Robot 3246dc2665 KWSys Nightly Date Stamp 2011-09-08 00:14:08 -04:00
David Cole 4e3d428cc3 Merge topic 'fix-12446-no-cmake-E-build'
96d106a CMake: Remove documentation for -E build (#12446)
2011-09-07 15:39:21 -04:00
David Cole fde0a4ddd1 Merge topic 'fix-12377-xcode-honor-g0'
cb22afc Xcode: Honor -g0 to disable debugging (#12377)
2011-09-07 15:39:15 -04:00
David Cole 1a5c99581e Merge topic 'fix-12284-cpack-symlinks'
7b8dcdd CPack: Do not recurse through directory symlinks (#12284)
d78bdb2 CMake: Write symlinks to directories as files in archives (#12284)
2011-09-07 15:39:03 -04:00
David Cole 05bc6bfb87 Merge topic 'fix-12260-fix-valgrind-output-parsing'
eb4af16 CTest: Fixed valgrind output parsing (#12260)
2011-09-07 15:38:32 -04:00
David Cole db4154661c Merge topic 'fix-12370-no-space-in-target-name'
e05e0f1 Xcode: No spaces in makefile target names (#12370)
2011-09-07 15:38:16 -04:00
David Cole f62540adcc Merge topic 'fix-errors-from-cppcheck-issue-12440'
d1751fb ccmake: Fix off-by-one memory access error
4868921 Fix file() command descriptor leak on error
f47393c CTest: Fix memory leaks on error
2011-09-07 15:37:48 -04:00
David Cole d9ad72542a Merge topic 'fortran-format'
90efed6 Xcode: Honor Fortran_FORMAT target and source file property
5c0c635 Fortran: Add support for free- and fixed-form flags
47a0c75 VS: Map Fortran free- and fixed-format flags to IDE options
d6e2a06 VS: Map per-source Fortran flags to IDE options
2011-09-07 15:37:27 -04:00
David Cole 103ab60dd7 Merge topic 'fix-zero-check-mistake'
57bc42a Xcode: Do not emit the ZERO_CHECK target more than once
2011-09-07 15:37:15 -04:00
David Cole 18897d63a5 Merge topic 'save-cache-at-end-of-generate'
0c28b48 CMake: Add SaveCache at the end of successful Generate calls
2011-09-07 15:37:07 -04:00
KWSys Robot 540b25d529 KWSys Nightly Date Stamp 2011-09-07 00:14:04 -04:00
Matt McCormick 96d106a78d CMake: Remove documentation for -E build (#12446)
The '-E build build_dir' command was created and documented, but then
morphed into '--build build_dir' instead, ... and then the -E documentation
was never removed. This commit fixes that oversight.
2011-09-06 17:42:32 -04:00
Johan Bjork cb22afc02c Xcode: Honor -g0 to disable debugging (#12377)
This commit changes ExtractFlag to remove all occurences
of a flag, and only save the last one. (i.e., the dominant
one according to GCC rules)
2011-09-06 15:04:58 -04:00
Johan Björk 7b8dcdd173 CPack: Do not recurse through directory symlinks (#12284)
...when building CPack archive-based packages (.tar.gz and similar)

Rather, put the symlinks-to-directories into the archive as files,
and expect/trust that the things the symlinks point to are also in
the archive.
2011-09-06 14:04:37 -04:00
Johan Björk d78bdb2783 CMake: Write symlinks to directories as files in archives (#12284)
Do not recurse through directory symlinks when adding files.

Recursing through directory symlinks will generate broken archives,
i.e., they will look something like this:
  foo -> bar/bar
  foo/Info <- Shouldn't be in archive.
  bar/bar
  bar/bar/Info
2011-09-06 13:58:00 -04:00
David Cole 527a40f06f KWSys: Add symlinks to directories as files (#12284)
This behaviour was previously broken; regardless of the
RecurseThroughSymLinks value, symlinks to directories were
NEVER added as files in the results.

When RecurseThroughSymLinks is ON, symlinks to directories
should be recursed as if they were the actual directories
to gather the files within.

However, when RecurseThroughSymLinks is OFF, symlinks to
directories should be returned as files in the result.

Inspired-by: Johan Björk <phb@spotify.com>
2011-09-06 13:20:02 -04:00
David Cole 98cb017a9d KWSys: Remove always-true dir_only parameter
Its presence confuses, and, since it is always true, is useless.
2011-09-06 13:10:05 -04:00
KWSys Robot 5b4528b1f4 KWSys Nightly Date Stamp 2011-09-06 00:15:02 -04:00
Eric NOULARD 49da3bdb2d CPackDeb fix #10325 automagically use fakeroot for DEB if fakeroot is found 2011-09-05 22:43:45 +02:00
Johannes Stallkamp eb4af16298 CTest: Fixed valgrind output parsing (#12260)
Previous code was missing some matches in the output. This commit
fixes the regular expressions used for output matching to detect
numbers reported with commas in them, too.
2011-09-05 14:31:08 -04:00
Johan Björk e05e0f1d2c Xcode: No spaces in makefile target names (#12370)
Don't use spaces for target names in the makefiles.
2011-09-05 12:20:19 -04:00
KWSys Robot 48ba9b2f19 KWSys Nightly Date Stamp 2011-09-05 00:13:12 -04:00
KWSys Robot 99d8ca624d KWSys Nightly Date Stamp 2011-09-04 00:15:04 -04:00
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