David Cole
686eb4e815
Merge topic 'DESTDIR-documentation-enhancement'
...
d593cef
Enhance DESTDIR documentation. Fixes #0012374 .
2012-08-20 15:38:25 -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
Kitware Robot
addefc2ae3
CMake Nightly Date Stamp
2012-08-15 00:01:03 -04:00
Eric NOULARD
d593cef58f
Enhance DESTDIR documentation. Fixes #0012374 .
2012-08-14 20:15:22 +02: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
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
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
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
David Cole
4bdbdfbfef
Merge topic 'directory-typo'
...
6c8722f
Fix typo direcotry -> directory (and similar) [#13444 ]
2012-08-13 13:27:48 -04:00
David Cole
20f56a7eed
Merge topic 'EclipseFixBadLinkedResources'
...
4ea5dc5
Eclipse: fix #13358 : don't create bad linked resources
2012-08-13 13:27:17 -04:00
David Cole
85f843a7b4
Merge topic 'mixed-lib-to-lib64'
...
af80da3
remove lib64 Unix paths if the respective lib path is also given
733726e
find_library: Fix mixed lib->lib64 (non-)conversion cases (#13419 )
54add62
find_library: Simplify lib->lib<arch> expansion
6ca2f82
find_library: Refactor lib->lib64 conversion
1fe4b82
find_library: Add test covering lib->lib64 cases
2012-08-13 13:26:57 -04:00
David Cole
e93d9c5c2b
Merge topic 'use_normal_ouput_with_chdir'
...
4ddd3b9
Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir.
2012-08-13 13:26:48 -04:00
Kitware Robot
408c04e734
CMake Nightly Date Stamp
2012-08-13 00:01:02 -04:00
Kitware Robot
ee1ee20905
CMake Nightly Date Stamp
2012-08-12 00:01:02 -04:00
Kitware Robot
95e8636711
CMake Nightly Date Stamp
2012-08-11 00:01:02 -04:00
Brad King
e88bae77c3
Xcode: Run xcode-select to find Xcode version file ( #13463 )
...
Multiple versions of Xcode may be installed in different locations.
Run "xcode-select --print-path" to detect the active Xcode location
and parse its Contents/version.plist file. Note that the Xcode.app
directory name may vary in developer versions.
2012-08-10 12:58:22 -04:00
Kitware Robot
539cc289ba
CMake Nightly Date Stamp
2012-08-10 00:01:04 -04:00
David Cole
b3b43a420d
Begin post-2.8.9 development
2012-08-09 16:28:18 -04:00
David Cole
c462aafcfa
CMake 2.8.9
2012-08-09 13:57:02 -04:00
Kitware Robot
2c061d5cc9
CMake Nightly Date Stamp
2012-08-09 00:01:03 -04:00
Kitware Robot
121cc34d71
CMake Nightly Date Stamp
2012-08-08 00:01:05 -04:00
Kitware Robot
3bfabfa04a
CMake Nightly Date Stamp
2012-08-07 00:01:04 -04:00
Kitware Robot
e2a57173df
CMake Nightly Date Stamp
2012-08-06 00:01:02 -04:00
Kitware Robot
dc5b0b232b
CMake Nightly Date Stamp
2012-08-05 00:01:07 -04:00
Kitware Robot
92bf48dd9e
CMake Nightly Date Stamp
2012-08-04 00:01:10 -04:00
Zack Galbreath
76d6c59358
Clean up documentation formatting so that it is rendered properly in HTML.
2012-08-03 14:52:32 -04:00
Brad King
b237dbd8c3
Xcode: Fix object library references in multi-project trees ( #13452 )
...
In cmGlobalXCodeGenerator::Generate we generate a .xcodeproj for each
directory in the tree containing a project() command. First we
iteratively use SetGenerationRoot to add "ALL_BUILD" and other targets
to each project. This leaves "CurrentProject" set to the last project
when we invoke cmGlobalGenerator::Generate, which is not the same as the
top-level project if any subdirectories invoke the project() command.
When cmGlobalGenerator::Generate reaches CreateGeneratorTargets it
constructs cmGeneratorTarget and calls ComputeTargetObjects exactly once
per target. In this context the value of CurrentProject is undefined so
we cannot pass it to GetObjectsNormalDirectory. Use "$(PROJECT_NAME)"
instead so it will adapt automatically to each project.
Also teach Tests/ObjectLibrary to cover this case.
2012-08-03 10:17:49 -04:00
Kitware Robot
896524e13f
CMake Nightly Date Stamp
2012-08-03 00:01:05 -04:00
Kitware Robot
33b7f583a5
CMake Nightly Date Stamp
2012-08-02 00:01:04 -04:00
Kitware Robot
5adfe691a9
CMake Nightly Date Stamp
2012-08-01 00:01:05 -04:00
Kitware Robot
aa3dbec57d
CMake Nightly Date Stamp
2012-07-31 00:01:12 -04:00
Rolf Eike Beer
6c8722fab5
Fix typo direcotry -> directory (and similar) [ #13444 ]
2012-07-30 08:08:33 +02:00
Kitware Robot
8baeeed109
CMake Nightly Date Stamp
2012-07-30 00:01:06 -04:00
Kitware Robot
aedc2251fe
CMake Nightly Date Stamp
2012-07-29 00:01:07 -04:00
Alex Neundorf
4ea5dc5ba5
Eclipse: fix #13358 : don't create bad linked resources
...
Don't create linked resources which point to CMAKE_BINARY_DIR
itself or one of its parent dirs. Eclipse complained about that.
Alex
2012-07-28 18:42:47 +02:00
Kitware Robot
f66c82c8ac
CMake Nightly Date Stamp
2012-07-28 00:01:02 -04:00
Kitware Robot
fb0bcc001c
CMake Nightly Date Stamp
2012-07-27 00:01:07 -04:00
Kitware Robot
cac490aa70
CMake Nightly Date Stamp
2012-07-26 00:01:05 -04:00
David Cole
cda3626645
CMake 2.8.9-rc3
2012-07-25 11:25:40 -04:00
David Cole
78c83bc209
Merge branch 'release'
2012-07-25 11:24:39 -04:00
Kitware Robot
e5126cf405
CMake Nightly Date Stamp
2012-07-25 00:01:11 -04:00