summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'CPackDeb-dpkg-shlibdeps-check-flag' into releasev3.3.0-rc1Brad King2015-06-031-7/+11
|\
| * CPackDeb: Check dpkg-shlibdeps --ignore-missing-info flagBrad King2015-06-031-3/+6
| | | | | | | | | | | | Check for this flag explicitly in the --help output before using it. It turns out there are some versions of the tool that support --version but not --ignore-missing-info.
| * CPackDeb: Check dpkg-shlibdeps version more robustlyBrad King2015-06-031-4/+5
| | | | | | | | | | Use if(MATCHES) to verify that a match exists before using the match group variable.
* | CMake 3.3.0-rc1 version updateBrad King2015-06-022-4/+4
| |
* | Help: Drop development topic notes to prepare releaseBrad King2015-06-022-9/+0
|/ | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* Merge topic 'doc-3.3-relnotes'Brad King2015-06-0256-363/+294
|\ | | | | | | | | | | c952d790 Help: Organize and revise 3.3 release notes 8ce87ac6 Help: Consolidate 3.3 release notes
| * Help: Organize and revise 3.3 release notesBrad King2015-06-021-139/+169
| | | | | | | | | | | | Add section headers similar to the 3.2 release notes and move each individual bullet into an appropriate section. Revise and consolidate some bullets covering related areas.
| * Help: Consolidate 3.3 release notesBrad King2015-06-0256-363/+264
|/ | | | | | | | | | | | | | Move all development release notes into a new version-specific document: tail -q -n +3 Help/release/dev/* > Help/release/3.3.rst git rm -- Help/release/dev/* except the sample topic: git checkout HEAD -- Help/release/dev/0-sample-topic.rst Reference the new document from the release notes index document. Add a title and intro sentence to the new document by hand.
* Merge topic 'FindPostgreSQL-updates'Brad King2015-06-021-19/+25
|\ | | | | | | | | | | | | | | | | | | d4fd30d8 FindPostgreSQL: Search some more common packaging locations 8bd95059 FindPostgreSQL: Add help text for PostgreSQL_LIBRARY cache entry a68e9b7c FindPostgreSQL: Document PostgreSQL_LIBRARY_DIRS result variable cc3aee04 FindPostgreSQL: Search for versions 9.2, 9.3, and 9.4 6a2851a1 FindPostgreSQL: Remove extra whitespace after command open parens b7ca6f90 FindPostgreSQL: Remove unused lines
| * FindPostgreSQL: Search some more common packaging locationsTamar Kranenburg2015-06-011-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use PATH_SUFFIXES to search more common packaging locations. On Windows, we can use suffixes to search in the standard Program Files locations without hard-coding the C:/ path. On Ubuntu/Debian, starting with PostgreSQL 9.3 the header file pg_type.h is moved to a separate package (from libpq-dev to postgresql-server-dev) and consequently the file pg_type.h is moved to a new location: /usr/include/postgresql/<version>/server/catalog/pg_type.h While at it, use separate PATH_SUFFIXES variables for library, type and include (this is merely an optimization).
| * FindPostgreSQL: Add help text for PostgreSQL_LIBRARY cache entryTamar Kranenburg2015-06-011-0/+2
| | | | | | | | | | The PostgreSQL_LIBRARY_DIR_MESSAGE variable was set with the needed text but never referenced.
| * FindPostgreSQL: Document PostgreSQL_LIBRARY_DIRS result variableTamar Kranenburg2015-06-011-0/+1
| |
| * FindPostgreSQL: Search for versions 9.2, 9.3, and 9.4Tamar Kranenburg2015-06-011-2/+2
| |
| * FindPostgreSQL: Remove extra whitespace after command open parensTamar Kranenburg2015-06-011-3/+3
| |
| * FindPostgreSQL: Remove unused linesTamar Kranenburg2015-06-011-5/+0
| |
* | Merge topic 'FindBoost-per-config-libraries'Brad King2015-06-021-0/+2
|\ \ | | | | | | | | | | | | b3df1e9f FindBoost: Fix Boost_LIBRARY_DIR_{RELEASE,DEBUG} cache entry configuration
| * | FindBoost: Fix Boost_LIBRARY_DIR_{RELEASE,DEBUG} cache entry configurationBrad King2015-06-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These cache entries introduced by commit 892b854f (FindBoost: Search for debug and release libraries separately, 2015-01-26) should be marked as advanced just as Boost_LIBRARY_DIR was. Also their _LAST values should be tracked so changes can be detected reliably. Both of these are handled by code looking in _Boost_VARS_LIB for a list of relevant variables. Fix construction of this list that was broken by the above commit. Reported-by: Sylvain Joubert <joubert.sy@gmail.com>
* | | CMake Nightly Date StampKitware Robot2015-06-021-1/+1
| | |
* | | Merge branch 'release'Brad King2015-06-010-0/+0
|\ \ \
| * | | CMake 3.2.3v3.2.3Brad King2015-06-011-1/+1
| | | |
* | | | Merge topic 'mingw32-make-backslash-workaround'Brad King2015-06-011-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7dd4a12c Revert "Makefile: Fix compilation after parent commit was backported"
| * | | | Revert "Makefile: Fix compilation after parent commit was backported"Brad King2015-06-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bfa57c5f80278abc044b7342e81e5aaad82bffab. This change should not be part of 'master', only in 'release' for CMake 3.2.
* | | | | Merge branch 'release'Brad King2015-06-011-1/+0
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | |
| * | | Merge branch 'mingw32-make-backslash-workaround' into releaseBrad King2015-06-011-1/+0
| |\ \ \ | | |/ /
| | * | Makefile: Fix compilation after parent commit was backportedBrad King2015-06-011-1/+0
| | | | | | | | | | | | | | | | | | | | The CMake 3.2 release branch does not have 'cmAlgorithms.h' and simply provides 'cmHasLiteralSuffix' in 'cmStandardIncludes.h' instead.
* | | | Merge topic 'FindPkgConfig_fix_extra_path'Brad King2015-06-014-1/+108
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d4c6531a FindPkgConfig: Fix extra paths for CMAKE_{FRAMEWORK,APPBUNDLE}_PATH vars
| * | | | FindPkgConfig: Fix extra paths for CMAKE_{FRAMEWORK,APPBUNDLE}_PATH varsDaniele E. Domenichelli2015-05-294-1/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CMAKE_FRAMEWORK_PATH and CMAKE_APPBUNDLE_PATH cache variables are supposed to be used to generate the extra paths passed to pkg-config, but instead the CMAKE_PREFIX_PATH variable is used. This bug was introduced by the refactor in commit v3.1.0-rc1~747^2~1.
* | | | | Merge topic 'FindMatlab-fix-visibility-and-reconfiguration'Brad King2015-06-016-4/+63
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8444809c FindMatlab: fix reconfiguration of Matlab_ROOT_DIR 5752e558 FindMatlab: fix header visibility of the generated mex files 221a0263 FindMatlab: Drop incorrect usage option from test helper script
| * | | | | FindMatlab: fix reconfiguration of Matlab_ROOT_DIRRaffi Enficiaud2015-06-015-2/+62
| | | | | |
| * | | | | FindMatlab: fix header visibility of the generated mex filesRaffi Enficiaud2015-06-011-1/+1
| | | | | |
| * | | | | FindMatlab: Drop incorrect usage option from test helper scriptRaffi Enficiaud2015-06-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | There is no 'working_directory' option.
* | | | | | Merge topic 'doc-add_dependencies-no-install'Brad King2015-06-011-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9504d7a9 Help: Explicitly mention lack of 'install' support in add_dependencies
| * | | | | | Help: Explicitly mention lack of 'install' support in add_dependenciesBrad King2015-06-011-1/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake-generated targets are not supported by add_dependencies. State this explicitly and use 'install' as an example since this may be commonly attempted.
* | | | | | Merge topic 'doc-cmake-compile-features-typo'Brad King2015-06-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9b1838f Help: Fix typo in cmake-compile-features(7) manual (#15594)
| * | | | | | Help: Fix typo in cmake-compile-features(7) manual (#15594)Erik Sjölund2015-05-291-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | target_link_libraries() is being used in the example code but target_include_directories() was probably meant to be used. The sentence that starts with "Consuming code then" indicates that the example is about using the appropriate include directory.
* | | | | | Merge topic 'file-log-less-data'Brad King2015-06-011-20/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eba12a43 cmFileCommand: Do not log raw protocol data from curl (#15589) 7e10f169 cmFileCommand: Clarify logic for populating LOG variable 0d37dcd3 cmFileCommand: Rename variable verboseLog => logVar 43c01e07 cmFileCommand: Remove leftover no-op debugging logic
| * | | | | | cmFileCommand: Do not log raw protocol data from curl (#15589)Brad King2015-05-281-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach cmFileCommandCurlDebugCallback to filter the debug data by type and show only summary information instead of the raw data. This avoids allocating memory for all data transferred by UPLOAD or DOWNLOAD.
| * | | | | | cmFileCommand: Clarify logic for populating LOG variableBrad King2015-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The chunkDebug buffer we use to accumulate the LOG variable content is populated if and only if a log variable was requested by the call, but it is much clearer to check that a log variable was requested explicitly before populating it.
| * | | | | | cmFileCommand: Rename variable verboseLog => logVarBrad King2015-05-281-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the LOG variable name consistent between UPLOAD and DOWNLOAD implementations.
| * | | | | | cmFileCommand: Remove leftover no-op debugging logicBrad King2015-05-281-11/+0
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove debugging logic left from commit v2.6.0~305 (add DOWNLOAD option to FILE command, 2008-02-06). The CURLE_OPERATION_TIMEOUTED code path does nothing that the code immediately after it does not do.
* | | | | | Merge topic 'update-kwsys'Brad King2015-06-013-14/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf365792 Merge branch 'upstream-kwsys' into update-kwsys ee71b751 KWSys 2015-05-27 (61e0419f)
| * \ \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-05-283-14/+51
| |\ \ \ \ \ \
| | * | | | | | KWSys 2015-05-27 (61e0419f)KWSys Robot2015-05-283-14/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 61e0419f | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' b1d560a0..61e0419f Brad King (1): 61e0419f SystemTools: Teach RemoveFile to tolerate missing file Matt McCormick (1): 9a6b7c3f cmake: Set CMP0056 to NEW
* | | | | | | | CMake Nightly Date StampKitware Robot2015-06-011-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2015-05-311-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2015-05-301-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-05-291-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'release'Brad King2015-05-280-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'ctest-update-gmake-error-match' into releaseBrad King2015-05-271-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-function-missing-endforeach' into releaseBrad King2015-05-189-1/+34
| |\ \ \ \ \ \