Commit Graph

28314 Commits

Author SHA1 Message Date
Stephen Kelly 80b433b05e cmGlobalGenerator: Don't use else after a return. 2015-06-03 01:04:00 +02:00
Stephen Kelly 52919ac8ac cmMakefile: Make cmListFileBacktrace default constructible. 2015-06-03 01:03:59 +02:00
Stephen Kelly b68f2ea8ae cmMakefile: Add API for elseif to create backtrace. 2015-06-03 01:03:58 +02:00
Stephen Kelly 17e13f0a2d cmMakefile: Simplify CMP0000 handling. 2015-06-03 01:03:57 +02:00
Brad King d3bb5da929 Begin post-3.3 development 2015-06-02 11:19:44 -04:00
Brad King 4a96a4e3be Merge branch 'release' 2015-06-02 11:19:18 -04:00
Brad King c2cb80cbfa CMake 3.3.0-rc1 version update 2015-06-02 11:14:25 -04:00
Brad King 9805fd90af Help: Drop development topic notes to prepare release
Release versions do not have the development topic section of
the CMake Release Notes index page.
2015-06-02 11:12:33 -04:00
Brad King a6916a6c6e Merge topic 'doc-3.3-relnotes'
c952d790 Help: Organize and revise 3.3 release notes
8ce87ac6 Help: Consolidate 3.3 release notes
2015-06-02 11:11:30 -04:00
Brad King c952d790de Help: Organize and revise 3.3 release notes
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.
2015-06-02 11:08:33 -04:00
Brad King 8ce87ac6ef Help: Consolidate 3.3 release notes
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.
2015-06-02 09:10:30 -04:00
Brad King 3bcd2f538f Merge topic 'FindPostgreSQL-updates'
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
2015-06-02 09:03:54 -04:00
Brad King e14e1f273a Merge topic 'FindBoost-per-config-libraries'
b3df1e9f FindBoost: Fix Boost_LIBRARY_DIR_{RELEASE,DEBUG} cache entry configuration
2015-06-02 09:03:52 -04:00
Kitware Robot d9f630a171 CMake Nightly Date Stamp 2015-06-02 00:01:09 -04:00
Brad King 8b8baf5f95 Merge branch 'release' 2015-06-01 14:26:01 -04:00
Brad King b3de2a8e64 CMake 3.2.3 2015-06-01 11:36:29 -04:00
Brad King fe168ea4d2 Merge topic 'mingw32-make-backslash-workaround'
7dd4a12c Revert "Makefile: Fix compilation after parent commit was backported"
2015-06-01 11:34:14 -04:00
Brad King 7dd4a12c30 Revert "Makefile: Fix compilation after parent commit was backported"
This reverts commit bfa57c5f80.
This change should not be part of 'master', only in 'release'
for CMake 3.2.
2015-06-01 11:33:24 -04:00
Brad King 05845ac10f Merge branch 'release' 2015-06-01 11:09:28 -04:00
Brad King 1d2ae2b307 Merge branch 'mingw32-make-backslash-workaround' into release 2015-06-01 11:07:57 -04:00
Brad King bfa57c5f80 Makefile: Fix compilation after parent commit was backported
The CMake 3.2 release branch does not have 'cmAlgorithms.h' and simply
provides 'cmHasLiteralSuffix' in 'cmStandardIncludes.h' instead.
2015-06-01 11:07:05 -04:00
Tamar Kranenburg d4fd30d8d8 FindPostgreSQL: Search some more common packaging locations
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).
2015-06-01 11:01:00 -04:00
Tamar Kranenburg 8bd9505976 FindPostgreSQL: Add help text for PostgreSQL_LIBRARY cache entry
The PostgreSQL_LIBRARY_DIR_MESSAGE variable was set with the
needed text but never referenced.
2015-06-01 10:50:27 -04:00
Tamar Kranenburg a68e9b7cae FindPostgreSQL: Document PostgreSQL_LIBRARY_DIRS result variable 2015-06-01 10:47:59 -04:00
Tamar Kranenburg cc3aee048c FindPostgreSQL: Search for versions 9.2, 9.3, and 9.4 2015-06-01 10:47:02 -04:00
Tamar Kranenburg 6a2851a144 FindPostgreSQL: Remove extra whitespace after command open parens 2015-06-01 10:46:12 -04:00
Tamar Kranenburg b7ca6f9037 FindPostgreSQL: Remove unused lines 2015-06-01 10:44:25 -04:00
Brad King b3df1e9f70 FindBoost: Fix Boost_LIBRARY_DIR_{RELEASE,DEBUG} cache entry configuration
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>
2015-06-01 10:10:08 -04:00
Brad King 836c4e9314 Merge topic 'FindPkgConfig_fix_extra_path'
d4c6531a FindPkgConfig: Fix extra paths for CMAKE_{FRAMEWORK,APPBUNDLE}_PATH vars
2015-06-01 09:37:34 -04:00
Brad King 02c4aa1f97 Merge topic 'FindMatlab-fix-visibility-and-reconfiguration'
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
2015-06-01 09:37:32 -04:00
Brad King 40bad51490 Merge topic 'doc-add_dependencies-no-install'
9504d7a9 Help: Explicitly mention lack of 'install' support in add_dependencies
2015-06-01 09:37:31 -04:00
Brad King f663e9d0a0 Merge topic 'doc-cmake-compile-features-typo'
a9b1838f Help: Fix typo in cmake-compile-features(7) manual (#15594)
2015-06-01 09:37:29 -04:00
Brad King 1992aaa96e Merge topic 'file-log-less-data'
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
2015-06-01 09:37:24 -04:00
Brad King 8247186281 Merge topic 'update-kwsys'
bf365792 Merge branch 'upstream-kwsys' into update-kwsys
ee71b751 KWSys 2015-05-27 (61e0419f)
2015-06-01 09:37:22 -04:00
Raffi Enficiaud 8444809c47 FindMatlab: fix reconfiguration of Matlab_ROOT_DIR 2015-06-01 09:24:06 -04:00
Raffi Enficiaud 5752e55805 FindMatlab: fix header visibility of the generated mex files 2015-06-01 09:24:06 -04:00
Raffi Enficiaud 221a02635e FindMatlab: Drop incorrect usage option from test helper script
There is no 'working_directory' option.
2015-06-01 09:23:54 -04:00
Brad King 9504d7a99b Help: Explicitly mention lack of 'install' support in add_dependencies
CMake-generated targets are not supported by add_dependencies.  State
this explicitly and use 'install' as an example since this may be
commonly attempted.
2015-06-01 09:13:23 -04:00
Kitware Robot d617dc6af4 CMake Nightly Date Stamp 2015-06-01 00:01:06 -04:00
Kitware Robot ab756293bf CMake Nightly Date Stamp 2015-05-31 00:01:05 -04:00
Kitware Robot fc01247f31 CMake Nightly Date Stamp 2015-05-30 00:01:06 -04:00
Daniele E. Domenichelli d4c6531a94 FindPkgConfig: Fix extra paths for CMAKE_{FRAMEWORK,APPBUNDLE}_PATH vars
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.
2015-05-29 19:22:57 +02:00
Erik Sjölund a9b1838f97 Help: Fix typo in cmake-compile-features(7) manual (#15594)
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.
2015-05-29 11:23:37 -04:00
Kitware Robot 49959d7a23 CMake Nightly Date Stamp 2015-05-29 00:01:08 -04:00
Brad King eba12a4361 cmFileCommand: Do not log raw protocol data from curl (#15589)
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.
2015-05-28 11:11:28 -04:00
Brad King 7e10f1691f cmFileCommand: Clarify logic for populating LOG variable
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.
2015-05-28 10:37:28 -04:00
Brad King 0d37dcd335 cmFileCommand: Rename variable verboseLog => logVar
This makes the LOG variable name consistent between UPLOAD and DOWNLOAD
implementations.
2015-05-28 10:33:44 -04:00
Brad King 43c01e0750 cmFileCommand: Remove leftover no-op debugging logic
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.
2015-05-28 10:16:37 -04:00
Brad King ec12336f15 Merge branch 'release' 2015-05-28 09:59:00 -04:00
Brad King e2bb333fac Merge branch 'release-3.1' 2015-05-28 09:57:44 -04:00