summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'file-GENERATE-source'Brad King2014-11-1324-3/+177
|\ | | | | | | | | | | b80557c7 file(GENERATE): Evaluate early to allow generating source files 0019d54b Genex: Fix whitespace issue.
| * file(GENERATE): Evaluate early to allow generating source filesStephen Kelly2014-11-1224-2/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The evaluation files must be known before cmTargetTraceDependencies attempts to find them, but we must actually generate the files after cmTargetTraceDependencies, as that can add to target SOURCES. The limitation is that the generated output name must not depend on the SOURCES of a target if the generated file is used by that target. Mark the output files as GENERATED so that trace dependencies does not expect them to already exist in the filesystem. Move the invokation of ForceLinkerLanguage in the Generate logic to after the generated file names are known. ForceLinkerLanguage tries to determine the sources of a target (in order to determine an already-known language) and otherwise fails to get information about the generated file. Test that the output of file(GENERATE) can be used as a target source file and that accessing the target SOURCES in the name of the output file is an error. Accessing the TARGET_OBJECTS would be a similar error if it was legal to use that generator expression in this context. That is not currently possible and is a different error condition, so test the current error output as a reminder to change the expected output if that becomes possible in the future. Test that generated rule files resulting from cmTargetTraceDependencies appear in the SOURCES generated in the output file.
| * Genex: Fix whitespace issue.Stephen Kelly2014-11-111-1/+1
| |
* | Merge topic 'compile-features-refactor'Brad King2014-11-136-70/+75
|\ \ | | | | | | | | | | | | | | | | | | | | | 32b91b9e Features: Run GNU feature tests with std=c++14 when available. 82c283f9 Features: Use the correct dialect flag when recording features. b18155b7 Features: Reorder the GNU C dialect feature tests e68d5c60 Features: Split the Clang testable features to a separate file.
| * | Features: Run GNU feature tests with std=c++14 when available.Stephen Kelly2014-11-121-1/+4
| | |
| * | Features: Use the correct dialect flag when recording features.Stephen Kelly2014-11-124-16/+16
| | | | | | | | | | | | | | | Avoid using -std=c++1y for compilers which support -std=c++14, for example.
| * | Features: Reorder the GNU C dialect feature testsStephen Kelly2014-11-121-2/+2
| | | | | | | | | | | | | | | This doesn't make a difference, but the consistency with other files is easier to reason about.
| * | Features: Split the Clang testable features to a separate file.Stephen Kelly2014-11-112-53/+55
| |/ | | | | | | These tests can be shared with the AppleClang compile feature tests.
* | Merge topic 'refactor-search-path-construction'Brad King2014-11-1312-455/+831
|\ \ | | | | | | | | | | | | | | | | | | 1abd7cd9 Use containers of labeled search paths instead of individual members 2a9ac4bd Encapsulate search path manipulation functions into a seperate class. 32922840 Refactor and seperate search path construction for find commands
| * | Use containers of labeled search paths instead of individual membersChuck Atkins2014-11-1210-106/+339
| | | | | | | | | | | | | | | | | | | | | Manage classes of search paths in labeled containers. This removes the need to have a seperate member variable for each type of search path, but also allows path types to be grouped togethor in various different ways and manipulated as subsets of the full set of search paths.
| * | Encapsulate search path manipulation functions into a seperate class.Chuck Atkins2014-11-119-345/+414
| | | | | | | | | | | | | | | | | | The functions for adding the various different types of paths have been factored out into a new class, cmSearchPath. It is to be used as a helper container class for the various find_* commands.
| * | Refactor and seperate search path construction for find commandsChuck Atkins2014-11-117-321/+395
| |/ | | | | | | | | | | | | Prior to this commit, the set of search paths to traverse for find commands was incrementally constructed. This change allows each group of paths, i.e. CMakeVariablePaths, UserHintsPaths, SystemEnvironmentPaths, etc. to be constructed and manipulated independently, and then all combined togethor.
* | Merge topic 'doc-install-SCRIPT-CODE-COMPONENT'Brad King2014-11-131-1/+2
|\ \ | | | | | | | | | | | | 7361e810 Help: Document COMPONENT option of install(SCRIPT/CODE) (#14956)
| * | Help: Document COMPONENT option of install(SCRIPT/CODE) (#14956)Brad King2014-11-131-1/+2
| | |
* | | Merge topic 'ExternalProject_UPDATE_DISCONNECTED'Brad King2014-11-134-1/+177
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c497f11 Help: Add notes for topic 'ExternalProject_UPDATE_DISCONNECTED' aba5cec6 ExternalProject: Add unit tests for UPDATE_DISCONNECTED 3f606fa7 ExternalProject: Add UPDATE_DISCONNECTED option c0b749cf ExternalProject: Always add a command to a step
| * | | Help: Add notes for topic 'ExternalProject_UPDATE_DISCONNECTED'Brad King2014-11-131-0/+6
| | | |
| * | | ExternalProject: Add unit tests for UPDATE_DISCONNECTEDDaniele E. Domenichelli2014-11-062-0/+108
| | | |
| * | | ExternalProject: Add UPDATE_DISCONNECTED optionDaniele E. Domenichelli2014-11-061-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If UPDATE_DISCONNECTED is set, the update step is not executed automatically when building the main target. The update step can still be added as a step target and called manually. This is useful if you want to allow to build the project when you are disconnected from the network (you might still need the network for the download step). This is disabled by default. The directory property EP_UPDATE_DISCONNECTED can be used to change the default value for all the external projects in the current directory and its subdirectories.
| * | | ExternalProject: Always add a command to a stepDaniele E. Domenichelli2014-11-061-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some generators (i.e. Xcode) will not generate a file level target if no command is set, and therefore the dependencies on this target will be broken. This patch sets an empty echo command that does nothing to avoid this issue.
* | | | CMake Nightly Date StampKitware Robot2014-11-131-1/+1
| | | |
* | | | Merge branch 'release'Brad King2014-11-120-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'emacs-mode-underscore-in-symbol' into releaseBrad King2014-11-122-2/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'kwsys-SystemInformation-AIX-_SC_AIX_REALMEM' into releaseBrad King2014-11-121-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'doc-CMAKE_INSTALL_PREFIX-link-GNUInstallDirs' into releaseBrad King2014-11-121-0/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'doc-index-xrefs' into releaseBrad King2014-11-122-3/+47
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'kwsys-SystemInformation-AIX-_SC_AIX_REALMEM'Brad King2014-11-120-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | a234bcaf KWSys SystemInformation: Check for _SC_AIX_REALMEM before using it
| * | | | | | | | KWSys SystemInformation: Check for _SC_AIX_REALMEM before using itÅdne Hovda2014-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a check for supported flag when querying for system memory on AIX 5.1.
* | | | | | | | | Merge topic 'update-curl'Brad King2014-11-121-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3dd26463 curl: Disable warnings to avoid changing 3rd party code
| * | | | | | | | | curl: Disable warnings to avoid changing 3rd party codeBrad King2014-11-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tell MSVC to use its lowest warning level inside curl sources.
* | | | | | | | | | Merge topic 'fix-vs12-GetVersionEx-warning'Brad King2014-11-121-0/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a6c3599 Suppress deprecation warnings for GetVersionEx
| * | | | | | | | | | Suppress deprecation warnings for GetVersionExBrad King2014-11-111-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio 12 (2013) deprecated GetVersionEx: warning C4996: 'GetVersionExW': was declared deprecated in favor of either "versionhelpers.h" or VerifyVersionInfo, neither of which exist in some of the older compilers we support. Rather than try to port conditionally to VerifyVersionInfo, simply suppress the warning for now.
* | | | | | | | | | | Merge topic 'update-kwsys'Brad King2014-11-123-156/+156
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75009e4b Merge branch 'upstream-kwsys' into update-kwsys 35ecc355 KWSys 2014-11-12 (5843f590)
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-11-123-156/+156
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | KWSys 2014-11-12 (5843f590)KWSys Robot2014-11-123-156/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 5843f590 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 88c8cc7f..5843f590 Ben Boeckel (1): 5843f590 cmake: remove arguments to endfoo and else commands Ådne Hovda (1): 2e4a0ff0 SystemInformation: Check for _SC_AIX_REALMEM before using it Change-Id: Ifabcd50984d8b24f6034a17d729e255dfc591bbc
* | | | | | | | | | | | Merge topic 'doc-index-xrefs'Brad King2014-11-122-3/+47
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ca9a459 Utilities/Sphinx: Add index entries for cross-references
| * | | | | | | | | | | Utilities/Sphinx: Add index entries for cross-referencesBrad King2014-11-122-3/+47
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a document transform to insert index and target nodes just before any CMake domain cross-reference node. This will make references to CMake domain objects appear in the index. Also add a comment explaining why it cannot be done in a result_nodes method of the CMakeXRefRole.
* | | | | | | | | | | Merge topic 'doc-CMAKE_INSTALL_PREFIX-link-GNUInstallDirs'Brad King2014-11-121-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00d4cdc9 Help: Link to GNUInstallDirs from CMAKE_INSTALL_PREFIX (#15246)
| * | | | | | | | | | Help: Link to GNUInstallDirs from CMAKE_INSTALL_PREFIX (#15246)Brad King2014-11-121-0/+5
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note to the CMAKE_INSTALL_PREFIX documentation that refers readers to the GNUInstallDirs module to make the latter easier to discover.
* | | | | | | | | | Merge topic 'emacs-mode-underscore-in-symbol'Brad King2014-11-122-2/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb80e513 Help: Add 3.1 release note Emacs mode update 30f14aeb cmake-mode.el: syntax of '_' should be treated as symbol
| * | | | | | | | | Help: Add 3.1 release note Emacs mode updateBrad King2014-11-121-0/+4
| | | | | | | | | |
| * | | | | | | | | cmake-mode.el: syntax of '_' should be treated as symbolSyohei YOSHIDA2014-11-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Word commands, such as foward-word(M-f), backward-kill-word(M-backspace), don't work well like other major-modes if syntax of '_' is treated as "word". Tested-by: Guillaume Papin <guillaume.papin@parrot.com>
* | | | | | | | | | CMake Nightly Date StampKitware Robot2014-11-121-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'release'Brad King2014-11-110-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch 'fix_link-line-dedup_regression' into releaseBrad King2014-11-116-4/+46
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ExternalProject-check-hash-before-download' into releaseBrad King2014-11-101-1/+14
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge topic 'ExternalProject-check-hash-before-download'Brad King2014-11-111-1/+14
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee7405a6 ExternalProject: Restore logic to not download already-existing file
| * | | | | | | | | | ExternalProject: Restore logic to not download already-existing fileBrad King2014-11-101-1/+14
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.1.0-rc1~85^2 (ExternalProject: Fix download retry logic, 2014-09-13) dropped the file(DOWNLOAD) EXPECTED_HASH argument. This prevents file(DOWNLOAD) from skipping the download if the output file already exists with the proper hash. Restore this check with explicit code in the download script. Reported-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
* | | | | | | | | | Merge topic 'fix_link-line-dedup_regression'Brad King2014-11-116-4/+46
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | | 4db31095 Fix link line order when shared libraries are de-duplicated
| * | | | | | | | Fix link line order when shared libraries are de-duplicatedDaniele E. Domenichelli2014-11-106-4/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~227^2~1 (De-duplicate shared library targets in generated link lines, 2014-07-30) we de-duplicate shared library targets on the link line. However, some toolchains will fail linking if an executable is linking to a shared library that is not used directly and a static library that depends on the shared one. The linker may not keep the reference to the shared library the first time and then the symbols needed by the static library may not be found. Fix this by reversing the direction of the for loop that removes the duplicate shared libraries, in order to ensure that the last occurrence of the library is left instead of the first one. Extend Tests/Dependency with a case covering this behavior. Create an executable that links to a shared library and a static library but only needs the shared library as a dependency of the static library. Co-Author: Brad King <brad.king@kitware.com>
* | | | | | | | | CMake Nightly Date StampKitware Robot2014-11-111-1/+1
| | | | | | | | |
generated by cgit v0.12 at 2025-02-09 08:33:11 (GMT)