13433 Commits

Author SHA1 Message Date
David Cole
b08657cf0f Xcode: Fix crash: avoid strlen call on NULL char *
Thanks to Johan Björk for the report on the CMake mailing list.
2011-01-27 06:57:12 -05:00
KWSys Robot
451c5f61c2 KWSys Nightly Date Stamp 2011-01-27 00:11:06 -05:00
Brad King
88548a45fb Handle relative WORKING_DIRECTORY in add_custom_(command|target)
This also fixes handling of trailing slashes in the directory name.
2011-01-26 18:02:02 -05:00
Brad King
7befc00783 Handle trailing slashes on add_custom_command DEPENDS 2011-01-26 18:01:33 -05:00
Brad King
833b8aa902 Merge topic 'recursive-CMAKE_USER_MAKE_RULES_OVERRIDE'
c83a834 try_compile: Allow only languages loaded in caller (#11469)
2011-01-26 15:25:18 -05:00
Brad King
7f37eac6dd Merge topic 'outdir-CMAKE_USER_MAKE_RULES_OVERRIDE'
5792d3a Always place try_compile executables predictably (#11724)
a5300f1 Clarify CMAKE_USER_MAKE_RULES_OVERRIDE documentation (#11724)
2011-01-26 15:24:44 -05:00
Brad King
5cd8b8bdfb Merge topic 'enable-using-devenv-as-cmakemakeprogram'
2ca1161 VS10: Enable using devenv as CMAKE_MAKE_PROGRAM (#11459)
2011-01-26 15:23:47 -05:00
Brad King
314ddcbf93 Merge topic 'fix-11147-avoid-vc10-filters-error-msg'
0cde56d VS10: Load projects with obj "source" files (#11147)
2011-01-26 15:23:37 -05:00
Brad King
0159424fda Merge topic 'dev/add_test-working-directory'
d94f9c6 Only set the property if the property was given
b6c302b Default the working dir to the current binary dir
0594287 Add more tests for WorkingDirectory for tests
2011-01-26 15:23:05 -05:00
Brad King
5ec9f6f609 Merge topic 'fix-try_compile-source-language-issue-11731'
699a725 Use shortest extension to verify try_compile language (#11731)
2011-01-26 15:22:27 -05:00
Brad King
41147fcf48 Merge topic 'improve-try_compile-error-messages'
1bee6b1 Improve try_compile and try_run error messages
2011-01-26 15:22:00 -05:00
Brad King
c9d3b602d0 Merge topic 'fix-11668-ccmake-resize-crash'
693c9a6 Avoid exceptions when ccmake terminal window is too small (#11668)
2011-01-26 15:21:48 -05:00
David Cole
78fe97f2ff Fix line too long KWStyle issue (#11695) 2011-01-26 08:25:25 -05:00
KWSys Robot
f0acf05656 KWSys Nightly Date Stamp 2011-01-26 00:10:07 -05:00
David Cole
662756036e VS10: Escape double quote chars in defines for rc files (#11695)
To get rc defines to work in the VS10 IDE requires \" when
constructing PreprocessorDefinitions strings. This is different
than defines for cl.

Also, per-file rc defines were not being generated. Fix that, too.
2011-01-25 19:01:13 -05:00
KWSys Robot
538160ce0e KWSys Nightly Date Stamp 2011-01-25 00:10:55 -05:00
Brad King
c83a834d29 try_compile: Allow only languages loaded in caller (#11469)
During a try_compile cmGlobalGenerator::EnableLanguage uses results from
the outer project.  Reject attempts to enable languages in the test
project that are not "ready" in the outer project.  Mark a language as
"ready" when all its information has been loaded and we are ready to
generate build rules.

This also avoids infinite recursion introduced by commit 295b5b60 (Honor
CMAKE_USER_MAKE_RULES_OVERRIDE in try_compile, 2010-06-29) for projects
that set CMAKE_USER_MAKE_RULES_OVERRIDE to a file that uses try_compile.
The file is loaded along with the information for a given langauge so
the language is not yet "ready".
2011-01-24 10:00:45 -05:00
KWSys Robot
caa2dbebb8 KWSys Nightly Date Stamp 2011-01-24 00:10:04 -05:00
KWSys Robot
87cd8ba8a0 KWSys Nightly Date Stamp 2011-01-23 00:12:03 -05:00
KWSys Robot
b0fb6624cf KWSys Nightly Date Stamp 2011-01-22 00:10:54 -05:00
David Cole
2ca116189f VS10: Enable using devenv as CMAKE_MAKE_PROGRAM (#11459)
If CMAKE_MAKE_PROGRAM is set to devenv, then GenerateBuildCommand
uses it just like we used to do for VS8 and VS9. Otherwise, it
still uses MSBuild.

This will let us run the CMake test suite through devenv and make
sure all the solution and project files we generate are load-able
and build-able by the VS 2010 IDE, not just MSBuild.

Inspired-By: Robert Lenhardt
2011-01-21 13:18:06 -05:00
David Cole
0cde56dda4 VS10: Load projects with obj "source" files (#11147)
WriteCLSources should skip source files with "obj" extensions
since WriteObjSources has already written them into the vcxproj
file. Likewise, WriteGroupSources should skip source files with
"obj" extensions to avoid receiving "item ... already exists under
the filter" project-load-time error messages from Visual Studio.
2011-01-21 10:57:34 -05:00
KWSys Robot
73827b9205 KWSys Nightly Date Stamp 2011-01-21 00:10:17 -05:00
Ben Boeckel
d94f9c6487 Only set the property if the property was given 2011-01-20 14:05:39 -05:00
Ben Boeckel
b6c302b1aa Default the working dir to the current binary dir
Keep backwards compatability with CMake <= 2.8.3.
2011-01-20 13:52:42 -05:00
Brad King
699a725584 Use shortest extension to verify try_compile language (#11731)
If the source-file form of try_compile is given a file name with
multiple '.' characters such as "a.b.c" use only the shortest extension
to check the language.  This is the expected behavior and is consistent
with normal language extension determination in the method
cmSourceFileLocation::UpdateExtension.
2011-01-20 09:02:57 -05:00
Brad King
1bee6b172b Improve try_compile and try_run error messages
Use IssueMessage to give the messages context and better formatting.
2011-01-20 08:58:49 -05:00
Brad King
5792d3a38a Always place try_compile executables predictably (#11724)
Set CMAKE_RUNTIME_OUTPUT_DIRECTORY explicitly in try_compile projects so
that the COPY_FILE feature knows where to look.  This makes the feature
robust against CMAKE_USER_MAKE_RULES_OVERRIDE files that set variables
like CMAKE_RUNTIME_OUTPUT_DIRECTORY or EXECUTABLE_OUTPUT_PATH.
2011-01-20 08:08:47 -05:00
Brad King
a5300f1d45 Clarify CMAKE_USER_MAKE_RULES_OVERRIDE documentation (#11724)
This variable was introduced to help authors override CMake's default
platform information before any of it is cached.  State this clearly in
the documentation.  Explicitly discourage use for other purposes.
2011-01-20 07:35:00 -05:00
KWSys Robot
1c8787f387 KWSys Nightly Date Stamp 2011-01-20 00:10:06 -05:00
Brad King
aa2b3db322 Merge topic 'depend-scan-backslash-issue-10281'
8dc7501 Normalize slashes in scanned #include lines (#10281)
2011-01-19 14:28:41 -05:00
Brad King
3e3af1f507 Merge topic 'vs-Fortran-SCC-issue-10237'
9859c64 Honor VS_SCC_* properties in Fortran targets (#10237)
2011-01-19 14:28:36 -05:00
Brad King
3a1975c529 Merge topic 'try_compile-Makefile-config'
052c2ae Document CMAKE_TRY_COMPILE_CONFIGURATION variable
56efc60 Honor CMAKE_TRY_COMPILE_CONFIGURATION in Makefile generators (#10809)
2011-01-19 14:28:32 -05:00
Brad King
20d11b9a33 Merge topic 'xcode-subdir-regen-dependencies'
809ef30 Xcode: Make generation depend on all input directories
2011-01-19 14:28:15 -05:00
Brad King
9ea63c581b Merge topic 'fix-xcode-custom-rules-makefile'
66d9cd8 Xcode: Disable implicit make rules in custom rules makefiles.
2011-01-19 14:28:09 -05:00
Brad King
cc6ba3abff Merge topic 'missing-file-dir-issue-11677'
7af41c3 Test that missing source mentions directory (#11677)
9cefce0 Report directory with missing source file (#11677)
2011-01-19 14:02:44 -05:00
Brad King
db276e48c4 Merge topic 'doc-if-dereferencing-issue-10773'
7d9b903 Clarify auto-dereference cases in if() command (#11701)
e4e14e8 Replace misleading example in the if() documentation (#10773)
2011-01-19 14:02:26 -05:00
Brad King
c6cb693147 Merge topic 'doc-old-get_X_property-commands'
4c980e3 Reference get_property() from old get_*_property() commands
0d7cf49 Fix get_(cmake|test)_property documentation (#11703)
2011-01-19 14:02:20 -05:00
Brad King
27039e62f9 Merge topic 'doc-try_compile-clarification'
cabb6cd Document Check(C|CXX)SourceCompiles behavior more clearly (#11688)
4da2a56 Document try_compile behavior more clearly (#11688)
2011-01-19 14:02:11 -05:00
Brad King
9ae65b866e Merge topic 'doc-hard-preprocessor-characters'
c64d138 Document COMPILE_DEFINITIONS known limitations (#11660, #11712)
668ce6b Combine duplicate COMPILE_DEFINITIONS disclaimer
2011-01-19 14:02:04 -05:00
David Cole
693c9a6236 Avoid exceptions when ccmake terminal window is too small (#11668)
Thanks to Nicolas Despres for the patch.
2011-01-19 11:24:36 -05:00
KWSys Robot
57c542a80f KWSys Nightly Date Stamp 2011-01-19 00:10:07 -05:00
KWSys Robot
00a0929c04 KWSys Nightly Date Stamp 2011-01-18 00:11:02 -05:00
Brad King
052c2ae1aa Document CMAKE_TRY_COMPILE_CONFIGURATION variable
Also reference it from try_compile and try_run since it affects those
commands.
2011-01-17 17:23:15 -05:00
Brad King
56efc60fa0 Honor CMAKE_TRY_COMPILE_CONFIGURATION in Makefile generators (#10809)
Previously this was used only in multi-configuration generators to
choose the configuration of try_compile and try_run at their build time.
Teach CMake to honor the variable in single-configuration generators as
the CMAKE_BUILD_TYPE.
2011-01-17 17:21:30 -05:00
Brad King
9859c64ffc Honor VS_SCC_* properties in Fortran targets (#10237)
Factor out generation of SccProjectName, SccLocalPath, and SccProvider
from cmLocalVisualStudio7Generator::WriteProjectStart and call it from
cmLocalVisualStudio7Generator::WriteProjectStartFortran too.
2011-01-17 15:41:24 -05:00
Brad King
8dc7501d50 Normalize slashes in scanned #include lines (#10281)
On Windows platforms source files may contain '\' in include directives:

  #include "a\b.h"

Normalize these while scanning to use forward slashes.  CMake will
convert from forward slashes to the direction preferred by the native
build tools when writing the path to 'depend.make' files.
2011-01-17 15:03:53 -05:00
Brad King
7d9b903756 Clarify auto-dereference cases in if() command (#11701)
Show "<variable|string>" explicitly in if() case documentation whenever
auto-dereferencing occurs.  Reference its presence from the explanation
at the bottom.
2011-01-17 09:43:41 -05:00
Brad King
4c980e36bb Reference get_property() from old get_*_property() commands
The former is a much more general and modern command.  Refer authors to
it from documentation of its predecessors.
2011-01-17 09:19:45 -05:00
Brad King
0d7cf4951a Fix get_(cmake|test)_property documentation (#11703)
The signature of get_test_property uses argument order

  test property VAR

not

  test VAR property

Also document the actual behavior when the property is not found.
2011-01-17 09:14:35 -05:00