David Cole
0075e7e033
Merge topic 'deployqt4-destdir'
...
1e3248c
DeployQt4: Include DESTDIR for some cpack generators.
2012-08-20 15:40:03 -04:00
David Cole
c2022eb06d
Merge topic 'fphsa-message'
...
213a9e5
fphsa: clarify message about minimum required version found.
2012-08-20 15:39:53 -04:00
David Cole
1b758bcf8e
Merge topic 'clarify-if-is_newer_than-docs'
...
0eaaa86
CMake: Clarify the documentation for if(f1 IS_NEWER_THAN f2)
2012-08-20 15:39:45 -04:00
David Cole
9f555e805d
Merge topic 'list-command-argument-fixes'
...
08c71ac
CMake.List test: explicitely test with lists containing only an empty string
52d9c38
list command: error on too many arguments
2012-08-20 15:39:35 -04:00
David Cole
14c8096ba8
Merge topic 'more-endif-closing-style-cleanups'
...
84b49be
Remove CMake multiline block-end command arguments
2012-08-20 15:39:26 -04:00
David Cole
d4be75be12
Merge topic 'FindX11-duplicate-includes-13316'
...
dd784dd
FindX11: avoid calling list(REMOVE_DUPLICATES) on an empty list
97c338b
FindX11: remove duplicates from X11 include path list (#13316 )
2012-08-20 15:39:18 -04:00
David Cole
b7f3cc22c3
Merge topic 'xcode-asm'
...
97140d3
Tests/Assembler: Do not use assembler in universal binaries
f3477ed
Xcode: Set ASM source language in project file (#13472 )
2012-08-20 15:39:09 -04:00
David Cole
2582994e57
Merge topic 'clang-asm'
...
7e8471c
Recognize Clang ASM support (#13473 )
2012-08-20 15:38:51 -04:00
David Cole
3574bb4842
Merge topic 'generator-expression-conditions'
...
9d9f616
Add $<CONFIG:...> boolean query generator expression
ebf05ab
Add boolean generator expressions
2012-08-20 15:38:42 -04:00
David Cole
5cf828c028
Merge topic 'CheckTypeSize-doc-10579'
...
c6fed68
CheckTypeSize: add a test for size of struct members
48783b7
CheckTypeSize: show in documentation how to get struct member size (#10579 )
2012-08-20 15:38:33 -04:00
David Cole
686eb4e815
Merge topic 'DESTDIR-documentation-enhancement'
...
d593cef
Enhance DESTDIR documentation. Fixes #0012374 .
2012-08-20 15:38:25 -04:00
David Cole
735bdecd30
Merge topic 'GetPrerequisites-file_cmd-advanced'
...
d269984
GetPrerequisites: Mark file_cmd as advanced cache entry
2012-08-20 15:38:16 -04:00
Kitware Robot
7f9a761e76
CMake Nightly Date Stamp
2012-08-20 00:01:03 -04:00
Kitware Robot
d46f8afae9
CMake Nightly Date Stamp
2012-08-19 00:01:05 -04:00
Kitware Robot
ea2fcabbaf
CMake Nightly Date Stamp
2012-08-18 00:01:02 -04:00
Kitware Robot
186e9bdc22
CMake Nightly Date Stamp
2012-08-17 00:01:02 -04:00
Kitware Robot
c4306dc805
CMake Nightly Date Stamp
2012-08-16 00:01:02 -04:00
Clinton Stimpson
1e3248c9d0
DeployQt4: Include DESTDIR for some cpack generators.
2012-08-15 19:36:50 -06:00
Clinton Stimpson
213a9e5a7b
fphsa: clarify message about minimum required version found.
...
Thanks to Dubrovskiy Viacheslav.
2012-08-15 18:23:55 -06:00
David Cole
0eaaa863ed
CMake: Clarify the documentation for if(f1 IS_NEWER_THAN f2)
...
...comparison operator in the IF command. In the event of
a tie, we intentionally return "true" so that dependent
build operations are guaranteed to occur until one file
is definitively newer than the other file.
A tie means we're not sure, so return true to be on the
safe side.
2012-08-15 19:52:21 -04:00
Rolf Eike Beer
08c71acc87
CMake.List test: explicitely test with lists containing only an empty string
2012-08-15 23:05:05 +02:00
Marcin Wojdyr
84b49be8f0
Remove CMake multiline block-end command arguments
...
removing arguments omitted in 9db3116226
2012-08-15 16:50:29 -04:00
Rolf Eike Beer
52d9c38e72
list command: error on too many arguments
...
SORT, REVERSE, and REMOVE_DUPLICATES can only operate on exactly one argument.
Until now all other arguments were silently ignored. Give an error instead.
2012-08-15 22:12:12 +02:00
Rolf Eike Beer
dd784dde72
FindX11: avoid calling list(REMOVE_DUPLICATES) on an empty list
2012-08-15 19:28:50 +02:00
Brad King
97140d3986
Tests/Assembler: Do not use assembler in universal binaries
...
If CMAKE_OSX_ARCHITECTURES is set then the computed assembler .s source
file may not work for all architectures. Skip it in that case.
2012-08-15 12:55:03 -04:00
Brad King
9d9f616792
Add $<CONFIG:...> boolean query generator expression
...
This expression evaluates to '1' or '0' to indicate whether the build
configuration for which the expression is evaluated matches tha named
configuration. In combination with the "$<0:...>" and "$<1:...>"
expressions this allows per-configuration content to be generated.
2012-08-15 11:44:49 -04:00
Brad King
ebf05abda1
Add boolean generator expressions
...
Add generator expressions that combine and use boolean test results:
$<0:...> = empty string (ignores "...")
$<1:...> = content of "..."
$<AND:?[,?]...> = '1' if all '?' are '1', else '0'
$<OR:?[,?]...> = '0' if all '?' are '0', else '1'
$<NOT:?> = '0' if '?' is '1', else '1'
These will be useful to evaluate (future) boolean query expressions and
condition content on the results. Include tests and documentation.
2012-08-15 11:44:49 -04:00
Brad King
f3477ed88c
Xcode: Set ASM source language in project file ( #13472 )
...
Also teach the Assembler test to build under Xcode.
Suggested-by: Tobias Pape <tobiaspape@gmail.com>
2012-08-15 11:03:57 -04:00
Brad King
7e8471ce7b
Recognize Clang ASM support ( #13473 )
...
Since commit 571dc748
(Recognize Clang C and C++ compilers, 2010-05-17)
we recognize Clang C and C++ support. Add Compiler/Clang-ASM.cmake to
enable use of Clang for ASM too. Also teach Assembler test to try Clang
as an assembler.
Suggested-by: Tobias Pape <tobiaspape@gmail.com>
2012-08-15 09:40:20 -04:00
Kitware Robot
addefc2ae3
CMake Nightly Date Stamp
2012-08-15 00:01:03 -04:00
Rolf Eike Beer
c6fed68ef8
CheckTypeSize: add a test for size of struct members
2012-08-14 21:14:33 +02:00
Rolf Eike Beer
48783b71fb
CheckTypeSize: show in documentation how to get struct member size ( #10579 )
2012-08-14 21:14:33 +02:00
Rolf Eike Beer
97c338bac9
FindX11: remove duplicates from X11 include path list ( #13316 )
...
Most if not all X11 includes are typically in the same directory, so this
usually returns a huge list with only very few different entries.
2012-08-14 21:13:44 +02:00
Eric NOULARD
d593cef58f
Enhance DESTDIR documentation. Fixes #0012374 .
2012-08-14 20:15:22 +02:00
Brad King
d269984e53
GetPrerequisites: Mark file_cmd as advanced cache entry
...
This internal implementation detail should not pollute the main
cache view of projects that include GetPrerequisites.
2012-08-14 09:02:08 -04:00
Brad King
cd3bd23266
Merge topic 'cleanup-style'
...
68bc863
Merge branch 'master' into cleanup-style
a05eba5
CMakeVersion.bash: Update sed expression for lower-case 'set'
3c0488d
Fix WarnUnusedUnusedViaUnset test pass/fail regex
6c2c483
Remove trailing TAB from NSIS.template.in
9db3116
Remove CMake-language block-end command arguments
77543bd
Convert CMake-language commands to lower case
7bbaa42
Remove trailing whitespace from most CMake and C/C++ code
be9db98
Merge topic 'watcom-compiler-version'
af42ae4
Watcom: Simplify compiler version detection (#11866 )
2012-08-14 08:31:45 -04:00
Brad King
68bc863d5b
Merge branch 'master' into cleanup-style
...
Conflicts:
Source/CMakeVersion.cmake
2012-08-14 08:27:23 -04:00
Brad King
a05eba57b5
CMakeVersion.bash: Update sed expression for lower-case 'set'
...
Since commit 77543bde
(Convert CMake-language commands to lower case,
2012-08-13) the CMakeVersion.cmake file contains lower-case 'set'
commands. Teach CMakeVersion.bash to replace the lower-case name
instead of the old upper-case 'SET'.
2012-08-14 08:25:51 -04:00
Brad King
3c0488d7d3
Fix WarnUnusedUnusedViaUnset test pass/fail regex
...
After conversion of Modules .cmake files to lower case the
FAIL_REGULAR_EXPRESSION for this test matched warnings in modules other
than the test line itself. Make the pass and fail regular expressions
specific to the file containing the lines they are testing.
2012-08-14 08:06:19 -04:00
Brad King
6c2c483ef9
Remove trailing TAB from NSIS.template.in
...
This was missed by commit 7bbaa428
(Remove trailing whitespace from most
CMake and C/C++ code, 2012-08-13) which only removed trailing spaces,
not TABs.
2012-08-14 08:05:41 -04:00
Kitware Robot
9acb4f118c
CMake Nightly Date Stamp
2012-08-14 00:01:08 -04:00
Kitware Robot
9db3116226
Remove CMake-language block-end command arguments
...
Ancient versions of CMake required else(), endif(), and similar block
termination commands to have arguments matching the command starting the
block. This is no longer the preferred style.
Run the following shell code:
for c in else endif endforeach endfunction endmacro endwhile; do
echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
egrep -z -v 'Tests/CMakeTests/While-Endwhile-' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
2012-08-13 14:19:16 -04:00
Kitware Robot
77543bde41
Convert CMake-language commands to lower case
...
Ancient CMake versions required upper-case commands. Later command
names became case-insensitive. Now the preferred style is lower-case.
Run the following shell code:
cmake --help-command-list |
grep -v "cmake version" |
while read c; do
echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
2012-08-13 14:19:16 -04:00
Kitware Robot
7bbaa4283d
Remove trailing whitespace from most CMake and C/C++ code
...
Our Git commit hooks disallow modification or addition of lines with
trailing whitespace. Wipe out all remnants of trailing whitespace
everywhere except third-party code.
Run the following shell code:
git ls-files -z -- \
bootstrap doxygen.config '*.readme' \
'*.c' '*.cmake' '*.cpp' '*.cxx' \
'*.el' '*.f' '*.f90' '*.h' '*.in' '*.in.l' '*.java' \
'*.mm' '*.pike' '*.py' '*.txt' '*.vim' |
egrep -z -v '^(Utilities/cm|Source/(kwsys|CursesDialog/form)/)' |
egrep -z -v '^(Modules/CPack\..*\.in)' |
xargs -0 sed -i 's/ \+$//'
2012-08-13 14:18:39 -04:00
Brad King
be9db98946
Merge topic 'watcom-compiler-version'
...
af42ae4
Watcom: Simplify compiler version detection (#11866 )
2012-08-13 14:18:28 -04:00
David Cole
f0295575d7
Merge topic 'xcode-select'
...
e88bae7
Xcode: Run xcode-select to find Xcode version file (#13463 )
2012-08-13 13:28:49 -04:00
David Cole
e0f7d7fe5a
Merge topic 'CPackRPM-fixRelocatablePrefix'
...
822c1ea
Do not include directories which are part of the package install prefix.
2012-08-13 13:28:36 -04:00
David Cole
1f793ab6ba
Merge topic 'fix-typo-13456'
...
67f11cf
FindSelfPackers: fix typo (#13456 )
2012-08-13 13:28:25 -04:00
David Cole
396bc28477
Merge topic 'doc_fixes'
...
76d6c59
Clean up documentation formatting so that it is rendered properly in HTML.
2012-08-13 13:28:16 -04:00
David Cole
c1163632de
Merge topic 'xcode-object-dir'
...
b237dbd
Xcode: Fix object library references in multi-project trees (#13452 )
2012-08-13 13:28:07 -04:00