summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.1.3v3.1.3Brad King2015-02-111-1/+1
|
* Merge branch 'makefile-missing-comment' into release-3.1Brad King2015-02-101-1/+1
|\
| * Makefile: Fix regression in target-bound custom command COMMENT outputNils Gladitz2015-02-101-1/+1
| | | | | | | | | | Fix a logic typo introduced by commit v3.1.0-rc1~781^2 (Generalize cmCustomCommandGenerator to more fields, 2014-03-10).
* | Merge branch 'backport-no-global-setlocale' into release-3.1Brad King2015-02-069-12/+39
|\ \ | |/ |/|
| * Add setlocale() calls around use of libarchive APIs (#14934, #15377)Brad King2015-02-064-0/+39
| | | | | | | | | | | | | | | | | | | | The libarchive APIs use nl_langinfo(CODESET) for iconv so they need the locale to be set for LC_CTYPE. However, the rest of CMake does not define any behavior for non-ASCII character classification/conversion so we do not want to setlocale() globally. Add a RAII class to save, set, and restore the locale around calls to libarchive APIs. Inspired-by: Clinton Stimpson <clinton@elemtech.com>
| * Do not call setlocale() globally in CMake applications (#15377)Brad King2015-02-065-12/+0
|/ | | | | | | | | | | Revert the changes made by commit v3.1.0-rc1~406^2~1 (Encoding: Add setlocale() to applications, 2014-05-30) and commit v3.1.0-rc1~406^2 (Encoding: Change to only set LC_CTYPE, 2014-06-11), and other setlocale calls added later in their spirit. CMake has not been taught how to deal with non-C locales everywhere. We do not define any functionality for character conversions for non-ASCII strings. Another solution will be needed to address the original problem motivating addition of setlocale() calls.
* CMake 3.1.2v3.1.2Brad King2015-02-041-1/+1
|
* Merge branch 'fix-msvc-linker-flags-typo' into release-3.1Brad King2015-02-032-2/+2
|\
| * MSVC: Fix initialization of RelWithDebInfo shared library link flags (#15385)Brad King2015-02-032-2/+2
| | | | | | | | | | | | | | | | | | | | Initialize CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT from the value of CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT rather than the one for the DEBUG configuration. This typo has been present since the logic was first added in commit 36db45082e (ENH: fix up several problems with new stuff, 2002-11-11). Reported-by: Gunnar Roth <gunnar.roth@gmx.de>
* | Merge branch 'fix-default-install-config' into release-3.1Brad King2015-02-031-9/+5
|\ \
| * | install: Fix regression in default configuration selectionBen Boeckel2015-02-031-9/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | The refactoring in commit v3.1.0-rc1~812^2~16 (stringapi: Pass configuration names as strings, 2014-02-09) broke the code path in cmLocalGenerator::GenerateInstallRules that intends to pick a default install configuration for multi-config generators. Fix the logic to select an empty default configuration only when using a single-config generator whose CMAKE_BUILD_TYPE is not set. Inspired-by: Roman Wüger <roman.wueger@gmx.at> Reported-by: NoRulez <norulez@me.com>
* | Merge branch 'backport-fix-cpack-symlink-create-dir' into release-3.1Brad King2015-01-301-0/+12
|\ \
| * | CPack: Fix packaging of source tarballs with symbolic linksBill Hoffman2015-01-301-0/+12
| |/ | | | | | | | | | | When staging the package installation, if the first file in a directory happens to be a symbolic link, make sure we create the directory before trying to create the link.
* | Merge branch 'ctest-update-gmake-error-match' into releaseBrad King2015-01-281-2/+2
|\ \
| * | ctest_build: Update GNU make error message matching (#15379)Marco Nolden2015-01-281-2/+2
| |/ | | | | | | | | | | | | The "No rule to make target" error message of gmake is not correctly recognized since GNU make changed the quoting style in commit 23c2b99e9d (Convert all "`'" quotes to "''" per new GNU Coding Standard guidelines, 2012-03-04). Fix our regex to match both old and new quoting styles.
* | Merge branch 'fix-OBJECT_DEPENDS-after-path-normalization' into releaseBrad King2015-01-285-0/+35
|\ \
| * | Normalize OBJECT_DEPENDS paths to match custom commands (#15366)Brad King2015-01-285-0/+35
| |/ | | | | | | | | | | | | | | | | | | Custom command path normalization added in commit v3.1.0-rc1~471^2 (add_custom_command: Normalize OUTPUT and DEPENDS paths, 2014-05-28) broke use of OBJECT_DEPENDS to bring in custom commands because the latter paths were not normalized too. Normalize them and add a test case. Reported-by: Daniel v. Gerpen
* | Merge branch 'OpenSSL_102' into releaseBrad King2015-01-281-1/+1
|\ \
| * | FindOpenSSL: fix detection of OpenSSL 1.0.2Guillaume Belz2015-01-271-1/+1
| |/
* | Merge branch 'doc-link_libraries-note' into releaseBrad King2015-01-262-9/+12
|\ \
| * | Help: Clarify status of link_libraries commandBrad King2015-01-262-9/+12
| |/ | | | | | | | | | | | | | | | | The command has been documented as 'deprecated', but it is not really slated for removal and can still be used. Clarify this in the documentation. While at it, revise the documentation to use wording more consistent with that now in target_link_libraries. Suggested-by: Christoph Grüninger <foss@grueninger.de>
* | Merge branch 'backport-kwsys-directory-check-opendir' into releaseBrad King2015-01-231-0/+5
|\ \
| * | KWSys Directory: Check opendir return value before using it (#15367)Brad King2015-01-231-0/+5
| |/ | | | | | | In Directory::GetNumberOfFilesInDirectory add a missing check for NULL.
* | Merge branch 'FeatureSummary-fix-doc-typo' into releaseBrad King2015-01-231-2/+2
|\ \ | |/ |/|
| * FeatureSummary: Fix bracket in documentation.Christoph Grüninger2015-01-231-2/+2
|/
* CMake 3.1.1v3.1.1Brad King2015-01-201-1/+1
|
* Merge branch 'doc-virtual-override-specifiers-links' into releaseBrad King2015-01-191-2/+7
|\
| * Help: Link relevant documents for virtual override features (#15311)Stephen Kelly2015-01-191-2/+7
| |
* | Merge branch 'xcode-target-sort' into releaseBrad King2015-01-192-14/+54
|\ \
| * | Xcode: Sort targets deterministically and with ALL_BUILD first (#15346)Ben Boeckel2015-01-191-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default target in XCode is the first one in the file. In commit v3.1.0-rc1~286^2 (cmTarget: use a hash_map for cmTargets typedef, 2014-06-10) the order of the targets stored in cmMakefile was made non-deterministic instead of lexicographic. Teach the Xcode generator to do its own sorting to restore a predictable order. While at it, place ALL_BUILD first (as is done in VS IDE generators) explicitly in the comparison function so that it is the default target even if other targets sort earlier lexicographically (e.g. "AAA").
| * | Xcode: Fix early termination on per-config source file errorBrad King2015-01-192-13/+29
| |/ | | | | | | | | | | | | | | | | In commit v3.1.0-rc1~687^2~4 (cmTarget: Make the source files depend on the config, 2014-02-13) an early termination case was added to the Xcode generator. Fix handling of this case to actually abort all the generation steps. Otherwise some of the later steps are attempted without the preconditions normally established by earlier steps, possibly leading to a crash.
* | Merge branch 'emacs-mode-fix-word-at-point' into releaseBrad King2015-01-191-0/+1
|\ \
| * | cmake-mode.el: Re-add explicit call to require thingatptPeter Vasil2015-01-191-0/+1
| | | | | | | | | | | | | | | | | | Usually it is not needed to call '(require 'thingatpt')' explicitly because the function 'symbol-at-point' is in autoloaded but to be sure to have the function loaded in every case, require thingatpt.
* | | Merge branch 'emacs-mode-fix-word-at-point' into releaseBrad King2015-01-191-3/+7
|\ \ \ | |/ /
| * | cmake-mode.el: Fix extracting keyword at point in cmake-helpPeter Vasil2015-01-191-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc2~1^2~1 (cmake-mode.el: syntax of '_' should be treated as symbol, 2014-11-12) the 'word-at-point' function does not extract the whole keyword anymore if it contains an '_', because 'forward-word' stops at '_'. Use 'symbol-at-point' to extract a whole keyword even if there is an '_'.
* | | Merge branch 'FindQt-fixes' into releaseBrad King2015-01-161-3/+10
|\ \ \
| * | | FindQt: explicitely mention that it cannot Qt5 or laterRolf Eike Beer2015-01-161-0/+3
| | | |
| * | | FindQt: fix variable name in error messageRolf Eike Beer2015-01-161-2/+2
| | | |
| * | | FindQt: fix setting DESIRED_QT_VERSION if "find_package(Qt VVV)" was calledRolf Eike Beer2015-01-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the given version was not only "3" or "4", but something like "4.8" DESIRED_QT_VERSION was set to an unsupported value. While at it also check that the version passed in is really in the range of 3.x and 4.x. Also suggest switching to the more specific find modules if possible.
* | | | Merge branch 'fix-cmake-org-links' into releaseBrad King2015-01-163-4/+4
|\ \ \ \
| * | | | Help: Update cmake.org links to avoid redirectsWilliam Lynch2015-01-163-4/+4
| | |_|/ | |/| | | | | | | | | | Some links to cmake.org now redirect, so link to the new pages directly.
* | | | Merge branch 'release-3.0' into releaseBrad King2015-01-161-0/+1
|\ \ \ \
| * \ \ \ Merge branch 'eclipse-fix-cxx-natures' into release-3.0Brad King2015-01-161-0/+1
| |\ \ \ \
| | * | | | Eclipse: Add org.eclipse.cdt.core.cnature to CXX projects (#15068)André Klitzing2015-01-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.0.0-rc1~335^2~1 (eclipse: Add natures for Eclipse based on enabled languages, 2013-08-29) CXX projects got only "ccnature", but Eclipse itself also adds "cnature" when creating C++ projects. Fix this by adding both for CXX projects.
* | | | | | Merge branch 'fix-qcc-compiler-id' into releaseBrad King2015-01-153-3/+3
|\ \ \ \ \ \
| * | | | | | QNX: Fix detection of QCC compiler id (#15349)Brad King2015-01-143-3/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.1.0-rc1~113^2 (Use a more reliable regex for extracting binary INFO strings, 2014-09-03) the matching of INFO: strings was made more strict and no longer matches just "INFO:qnxnto". Use "INFO:qnxnto[]" instead to conform to the new pattern.
* | | | | | Merge branch 'fix-COMPILE_FEATURES-genex' into releaseBrad King2015-01-153-9/+17
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Features: Fix the COMPILE_FEATURES genex for unavailable features.Stephen Kelly2015-01-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the genex tested only for CMake knowledge of the feature, but not compiler knowledge of the feature.
| * | | | | cmMakefile: Rename a method to what it really does.Stephen Kelly2015-01-123-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | The method does not test availability of compile features.
* | | | | | Merge branch 'cpack-PackageMaker-OSX-10.10' into releaseBrad King2015-01-152-10/+26
|\ \ \ \ \ \
generated by cgit v0.12 at 2025-04-16 02:05:17 (GMT)