summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-function-missing-end' into releaseBrad King2015-06-2213-27/+52
|\
| * Fix assertion failure on unmatched function or macroBrad King2015-06-2213-27/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit v3.2.3~3^2 (Fix assertion failure on unmatched foreach in function, 2015-05-18) broke handling of unmatched non-loop blocks because it assumed all function blockers removed during error unwinding were for loops, essentially switching the set of mishandled cases. The purpose of the loop block push/pop operations is to define a scope matching the lifetime of the loop function blockers. Since our function blockers already have the proper lifetime, simply move the push/pop operations to their constructor/destructor. Extend the RunCMake.Syntax test with a case covering this.
* | Merge branch 'doc-cmake-buildsystem-typo' into releaseBrad King2015-06-221-1/+1
|\ \
| * | Help: Fix a typo in cmake-buildsystem(7) manualErik Sjölund2015-06-221-1/+1
| | | | | | | | | | | | | | | Add the property name INTERFACE_INCLUDE_DIRECTORIES that was missing from a set_property command.
* | | Merge branch 'doc-CMAKE_GENERATOR_PLATFORM-typo' into releaseBrad King2015-06-181-1/+1
|\ \ \
| * | | Help: Fix typo in CMAKE_GENERATOR_PLATFORM docs (#15621)Brad King2015-06-181-1/+1
| |/ / | | | | | | | | | s/toolset/platform/
* | | CMake 3.3.0-rc2v3.3.0-rc2Brad King2015-06-091-1/+1
| | |
* | | Merge branch 'doc-policy-OLD-deprecated' into releaseBrad King2015-06-0967-5/+139
|\ \ \
| * | | Help: Document explicitly that policy OLD behavior is deprecatedBrad King2015-06-0967-5/+139
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most likely documentation page a project author will read in response to a policy warning is the page for the policy itself. Add to every policy documentation page a note explicitly stating that the OLD behavior is deprecated. Also mention this in the cmake_policy() command documentation that explains how to set a policy to OLD. Suggested-by: Fraser Hutchison <fraser.hutchison@gmail.com>
* | | Merge branch 'doc-drop-incorrect-cmake-developer-advice' into releaseBrad King2015-06-081-1/+0
|\ \ \
| * | | Help: Drop incorrect advice from cmake-developer.7 manualBrad King2015-06-081-1/+0
| |/ / | | | | | | | | | | | | Drop the comment on the purpose of PATH_SUFFIXES in our Find Module example. It was incorrect.
* | | Merge branch 'revert-mingw-no-find_library-dll' into releaseBrad King2015-06-082-7/+1
|\ \ \
| * | | Windows-GNU: Restore find_library treatment of '.dll' as linkable (#15409)Brad King2015-06-082-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.3.0-rc1~435^2 (Windows-GNU: Do not tell find_library to treat '.dll' as linkable, 2015-02-18). MinGW tools support linking to '.dll' files directly and many non-CMake build systems still do not provide a separate '.dll.a' file.
* | | | Merge branch 'ctest-script-mode-no-legacy-cygwin' into releaseBrad King2015-06-081-0/+4
|\ \ \ \
| * | | | ctest: Disable CMake Cygwin legacy warning in dashboard client scriptBrad King2015-06-081-0/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | In ctest -S mode we load the CTestScriptMode module to give the configuration scripts access to the host system information. CYGWIN.cmake warns unless we explicitly tell it not to warn since there is no chance for a cmake_minimum_required(VERSION) to be called.
* | | | Merge branch 'cmake-gui-osx-install-command-line' into releaseBrad King2015-06-081-0/+1
|\ \ \ \
| * | | | cmake-gui: Make command-line install help text selectableClinton Stimpson2015-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This will allow users to cut-n-paste the instructions over to a command prompt.
* | | | | Merge branch 'FindwxWidgets-versioned-executable' into releaseBrad King2015-06-081-1/+2
|\ \ \ \ \
| * | | | | FindwxWidgets: Fix find_program call for versioned namesBrad King2015-06-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.3.0-rc1~132^2 (FindwxWidgets: Search for wx-config-3.0 in addition to wx-config, 2015-04-29) we added a second (versioned) name to the find_program call. Specifying multiple names requires use of the NAMES option. Add it now. While at it, also add versioned names for 2.9 and 2.8.
* | | | | | Merge branch 'doc-add_custom_command-clarify-TARGET_FILE' into releaseBrad King2015-06-081-0/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Help: Reference TARGET_FILE genex in add_custom_command docs (#15605)Brad King2015-06-081-0/+3
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When documenting in the COMMAND option how to reference an executable, we previously only explicitly covered how to do it for argv[0] and left it to the reader to follow the reference to the generator expressions manual. Add explicit mention of the TARGET_FILE genex in this documentation since it will be a commonly used generator expression in this context.
* | | | | 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
| | | | | | | | |
generated by cgit v0.12 at 2024-11-15 02:07:53 (GMT)