Commit Graph

18 Commits

Author SHA1 Message Date
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 96cd16380a Add CPACK_NSIS_INSTALL_ROOT for CMake's own installer (#9148)
Problem with CMake 2.8.4-rc1: when you launch the NSIS exe installer
on Windows, the default install path shown to the end user is, at first,
"\CMake 2.8".

This problem started occurring when configuring CMake itself with an
older CMake, after adding CPACK_NSIS_INSTALL_ROOT to fix issue 9148.
So... it's a regression from 2.8.3.

I forgot (again) that when you add a new CPack variable, you must
add it to CMake's CMakeCPack.cmake file or else it is empty when
configured with an older CMake. And on Windows, without a bootstrap
build available, the releases are always configured with an older
version of CMake. This may be the last time this has bitten me,
though, because it is now burned into my brain that problems with
CMake's installer itself are inevitably associated with adding new
CPack variables.

In addition to adding a definition for CPACK_NSIS_INSTALL_ROOT,
I've gone ahead and made it differ for the 32- and 64-bit builds
of CMake to give the end user the expected default value for the
Program Files folder for each one.

And, since I was adding a new 32/64 differentiator anyhow, I made
the "NSIS package name" and "installer registry key base" different
for 64-bit builds, too, by appending " (Win64)" to each one.

These address the concerns mentioned in 9148's related issue:
http://public.kitware.com/Bug/view.php?id=9094 (at least as far
as CMake's installer is concerned). 9094 could still use a good
general fix for all projects, though, and remains open for now.
2011-01-13 16:57:50 -05:00
Bill Hoffman 72bc82a98a Use cmake-gui.exe for the install/uninstall icon for cmake. 2009-09-25 11:26:28 -04:00
Bill Hoffman 1554265aa6 Remove CMakeSetup. Long live cmake-gui, start building Qt now. 2009-09-03 17:01:07 -04:00
David Cole 9f629f7a16 BUG: Add CPACK_NSIS_PACKAGE_NAME to the list of CPack variables that CMake overrides. We use the same value as the CPack-provided default, but do it here such that configuring with an older CMake will still give us this new variable. Necessary so that the CMake release process works with the new variable: CMake is configured with a previous CMake, but packaged with the freshly built CPack. (This fix is necessary because the fix for issue #8682 caused the side effect of having an empty CPACK_NSIS_PACKAGE_NAME for the CMake nightly package.) 2009-07-20 12:08:34 -04:00
Bill Hoffman ec10b44d1e ENH: do not create a desktop link for CMakeSetup 2009-06-26 10:18:11 -04:00
Bill Hoffman f59e3348b9 ENH: add cmake gui docs 2009-02-13 21:51:46 -05:00
Bill Hoffman a3790d258b ENH: deprecate CMakeSetup 2009-02-13 16:29:03 -05:00
Bill Hoffman 8c065add0c ENH: fix install in add/remove programs, again... 2008-07-01 10:58:57 -04:00
Bill Hoffman 042f4c334d ENH: fix crash in cpack when CPACK_CYGWIN_PATCH_NUMBER not specified 2008-03-12 21:54:27 -04:00
Bill Hoffman a3781c85fc ENH: install seems to be working for cmake-gui 2008-02-18 15:50:37 -05:00
Bill Hoffman f6014938cb ENH: make it so cmake-gui only installs if qt is static on windows 2008-02-09 09:53:52 -05:00
Bill Hoffman 9afb2100c1 ENH: for windows only allow a static qt for install and NSIS of cmake-gui 2008-02-07 11:43:20 -05:00
Bill Hoffman 4a426d4718 ENH: fix add/remove program name 2008-01-15 17:02:44 -05:00
David Cole 764f6838a7 ENH: Give Mac installers package relocation capability. Default location is still the same for backwards compatibility, but packages will now be relocatable by default like they are on Windows via the NSIS installer. New CPack variables for controlling this functionality are CPACK_PACKAGE_DEFAULT_LOCATION and CPACK_PACKAGE_RELOCATABLE. 2007-12-26 16:57:13 -05:00
Bill Hoffman 87c22309b8 ENH: change CPACK_CREATE_DESKTOP_LINKS to something that can handle spaces in the name of the exectuable 2007-11-07 13:11:58 -05:00
Bill Hoffman e65c40f94a ENH: add CPACK_PROJECT_CONFIG_FILE option to CPack 2007-10-31 12:55:04 -04:00