summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.1.0-rc3v3.1.0-rc3Brad King2014-12-081-1/+1
|
* Merge branch 'xerces-rename' into releaseBrad King2014-12-055-35/+37
|\
| * Modules: Rename FindXerces to FindXercesCBrad King2014-12-045-35/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FindXerces module was added in commit v3.1.0-rc1~155^2 (FindXerces: New module to find Apache Xerces-C++, 2014-08-17). However, there are two implementations of Xerces, one in C++: http://xerces.apache.org/xerces-c/ and one in Java: http://xerces.apache.org/xerces-j/ Rename FindXerces to FindXercesC to clarify that it is about the C++ implementation. While at it, add the missing CMake 3.1 release note about this module. Suggested-by: Erik Sjölund <erik.sjolund@gmail.com>
* | Merge branch 'doc-file-GENERATE-order' into releaseBrad King2014-12-051-1/+3
|\ \
| * | Help: Document file(GENERATE) signature option orderBrad King2014-12-051-1/+3
| |/ | | | | | | | | | | | | | | In commit v3.1.0-rc1~484^2 (Help: Format and revise file() command documentation, 2014-05-23) the signature of file(GENERATE) was accidentally simplified too much and dropped specification of the required argument ordering. Restore the signature to make the order clear.
* | Merge branch 'doc-mixed-case-commands' into releaseBrad King2014-12-041-2/+10
|\ \
| * | Utilities/Sphinx: Fix link targets for mixed-case command namesBrad King2014-12-041-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | When a CMake domain 'command' object is defined by CMakeTransform or the 'cmake:command' directive, generate the link target with a lower-case name even if the command name is not all lower-case. This is needed to make cross-references to the command definition work since the 'cmake:command' role is marked with the 'lowercase' property.
* | | Merge branch 'vs-phone-store-deployment-location' into releaseBrad King2014-12-038-12/+45
|\ \ \
| * | | VS: Add source file property to specify Windows App deployment locationGilles Khouzam2014-12-038-12/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a VS_DEPLOYMENT_LOCATION source file property to specify where to put files that are part of the package. For example: set_property(SOURCE ${ASSET_FILES} PROPERTY VS_DEPLOYMENT_LOCATION "assets") Without this, sources marked with VS_DEPLOYMENT_CONTENT cannot be located properly.
* | | | Merge branch 'vs-hlsl-settings' into releaseBrad King2014-12-038-5/+50
|\ \ \ \ | |/ / /
| * | | VS: Add source file properties to set the hlsl shader entry point and modelCedric Perthuis2014-12-038-5/+50
| | |/ | |/| | | | | | | | | | | | | Create properties VS_SHADER_ENTRYPOINT and VS_SHADER_MODEL. Without these many .hlsl source files may not be possible to use. Extend the VSWinStorePhone test project to cover them.
* | | Merge branch 'doc-CMAKE_CXX_KNOWN_FEATURES-typo' into releaseBrad King2014-12-031-1/+1
|\ \ \
| * | | Help: Fix typo in CMAKE_CXX_KNOWN_FEATURES docsDavid Demelier2014-12-031-1/+1
| |/ / | | | | | | | | | Typo "ss defined" => "as defined".
* | | Merge branch 'CPackIFW-doc-typos' into releaseBrad King2014-12-031-11/+11
|\ \ \
| * | | CPackIFW: Correction of the module documentationKonstantin Podsvirov2014-12-021-11/+11
| |/ /
* | | Merge branch 'doc-Nsight-Tegra-toolchain' into releaseBrad King2014-12-032-0/+21
|\ \ \
| * | | Help: Document Nsight Tegra toolchain configuration (#15276)Brad King2014-12-022-0/+21
| |/ /
* | | Merge branch 'fix-wince-unicode-entry-point' into releaseBrad King2014-12-031-2/+16
|\ \ \
| * | | VS, WINCE: Fix entry point for Unicode buildsPascal Bach2014-12-031-2/+16
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | When _UNICODE is defined VS uses wmain instead of main as the entry function. To make this correctly work on WindowsCE EntryPointSymbol needs to be set to mainWCRTStartup instead of mainACRTStartup for console applications and to wWinMainCRTStartup instead of WinMainCRTStartup for GUI applications. Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
* | | Merge branch 'FindOpenGL-revert-imported-targets' into releaseBrad King2014-12-022-43/+0
|\ \ \
| * | | FindOpenGL: Revert support for imported targets (#15267)Brad King2014-12-012-43/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the feature added by commit v3.1.0-rc1~420^2~2 (FindOpenGL: Provide imported targets for GL and GLU, 2014-05-31). Unfortunately it does not work on Windows because the full path to each library file is not actually known. The IMPORTED_LOCATION of an imported target must be a full path, but OPENGL_gl_LIBRARY is just 'opengl32' on Windows because the actual library file is in some implicit link directory that we may know know. More infrastructure will be needed in CMake to allow a name-only imported library. Until that exists, we will not be able to provide imported targets in FindOpenGL.
* | | Merge branch 'FindPythonInterp-Fix-1.4' into releaseBrad King2014-12-021-2/+2
|\ \ \
| * | | FindPythonInterp: fix version component variables for Python 1.4 (#15275)Rolf Eike Beer2014-12-021-2/+2
| | | | | | | | | | | | | | | | | | | | This bug was introduced in "FindPythonInterp: rework the version detection" 7d6db93de9ffc6e6092fa722aaf9c057dadcd634.
* | | | Merge branch 'doc-compile-features-typo' into releaseBrad King2014-12-021-1/+1
|\ \ \ \
| * | | | Help: Fix typo in cmake-compile-features(7) manualDavid Demelier2014-12-021-1/+1
| | |/ / | |/| | | | | | | | | | Fix spelling 'execptions' => 'exceptions'.
* | | | Merge branch 'link-no-empty-response-files' into releaseBrad King2014-12-011-1/+1
|\ \ \ \
| * | | | Makefile: Do not create an empty linker response fileBrad King2014-12-011-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~821^2 (Windows: Use response files to specify link libraries for GNU tools, 2014-03-04) we use a response file to pass possibly long linker flag lists to the GNU linker on Windows. On MinGW, this may cause gfortran to use a response file to pass some flags to its own internal invocation. This is okay except when we are parsing implicit link flags from the compiler ABI detection build. If gfortran uses a response file in that case then we may miss extracting some of the implicit link flags, such as -lgfortran. Fortunately, in the compiler ABI detection case we do not actually link to anything so the response file is empty. Work around this problem by simply not using a response file when the list of flags it is used to pass is empty (or just whitespace). Reported-by: Bill Somerville <bill@classdesign.com>
* | | | Merge branch 'fix-implicit-lib-logging' into releaseBrad King2014-12-011-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | CMakeParseImplicitLinkInfo: Fix implicit library loggingBrad King2014-12-011-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.1.0-rc1~640^2~5 (Clean up usage of if(... MATCHES regex) followed string(REGEX REPLACE regex), 2014-04-06) we accidentally broke logging of the implicit library detection. Restore use of the intermediate 'lib' variable so that the log message is constructed properly. Reported-by: Bill Somerville <bill@classdesign.com>
* | | Merge branch 'doc-ctest-j-typo' into releaseBrad King2014-12-011-1/+1
|\ \ \
| * | | Help: Add missing space to ctest -j option descriptionChristopher Dembia2014-12-011-1/+1
| | | |
* | | | Merge branch 'target-sources-error-conditions' into releaseBrad King2014-12-0119-8/+93
|\ \ \ \
| * | | | Help: Document the export limitation of INTERFACE_SOURCES.Stephen Kelly2014-11-292-0/+8
| | | | |
| * | | | Export: Disallow export of targets with INTERFACE_SOURCESStephen Kelly2014-11-299-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be allowed in the next release, but it needs to have some features present and tested such as * Ensuring that relative paths do not appear in the generated property. * Ensuring that paths to the source or build directories do not appear. * Generating a check in the file for CMake 3.1 or later so that the resulting property will be consumed. * Ensuring that any referenced targets are part of an export set and generating a check for them. * INSTALL_INTERFACE and BUILD_INTERFACE content. All of these checks are already done for INTERFACE_INCLUDE_DIRECTORIES, but it is too late to add them for INTERFACE_SOURCES for CMake 3.1. As the checks introduce some new error conditions, it is better to disallow exporting fully for this case and introduce proper error conditions later instead of policies.
| * | | | cmTarget: Don't allow relative paths in INTERFACE_SOURCESStephen Kelly2014-11-299-8/+47
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the pattern of checks that are made for INTERFACE_INCLUDE_DIRECTORIES. Existence is already checked by cmSourceFile::GetFullPath. Add a check to disallow relative paths in source directories. Otherwise code such as target_sources(lib1 INTERFACE foo.cpp) would fail if consumed by a target in a different directory. Unlike the INTERFACE_INCLUDE_DIRECTORIES behavior, we don't care whether the entry comes from an IMPORTED target or not. In the include directories case, the directory for a non-imported target might not exist yet but might be created. In the sources case, a file which does not yet exist in the filesystem must be explicitly marked with the GENERATED property. Adjust existing tests and add a new test for the error.
* | | | Merge branch 'fix-transitive-OBJECT_SOURCES-context' into releaseBrad King2014-12-012-35/+44
|\ \ \ \
| * | | | Genex: Fix evaluation context propagation for TARGET_OBJECTS.Stephen Kelly2014-11-262-35/+44
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract a new method to encapsulate the requirements of evaluating dependent-expressions, namely, propagation of the EvaluateForBuildsystem setting, which is missing from the getLinkedTargetsContent implementation. Commit v3.1.0-rc1~688^2 (Genex: Only evaluate TARGET_OBJECTS to determine target sources., 2014-03-20) introduced an error case for use of TARGET_OBJECTS outside of the context of generating the buildsystem, as the path to object files may be dependent on buildsystem variables (See bug #15226). Commit v3.1.0-rc1~314^2 (Allow INTERFACE_SOURCES to specify $<TARGET_OBJECTS> (#14970), 2014-07-09) made it possible to propagate such content to dependent targets. While that commit propagated the EvaluateForBuildsystem setting for the case of a TARGET_PROPERTY expression, as generated for direct dependencies of a target in cmTargetInternals::AddInterfaceEntries, it did not add propagation for content from further transitive target dependencies, as determined by getLinkedTargetsContent.
* | | | Merge branch 'doc-installed-file-property' into releaseBrad King2014-12-013-28/+69
|\ \ \ \
| * | | | Help: Add 3.1 release notes for INSTALL property scopeBrad King2014-12-011-0/+6
| | | | |
| * | | | Help: Document installed file property APINils Gladitz2014-12-012-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~479^2~1 (Add an "installed file" property scope, 2014-05-15) the get_property and set_property commands support an 'INSTALL' scope. Add documentation for this scope.
| * | | | Help: Format set_property and get_property command docsBrad King2014-12-012-28/+42
| | |/ / | |/| |
* | | | Merge branch 'doc-CMP0053-dedup-char' into releaseBrad King2014-12-011-1/+1
|\ \ \ \
| * | | | Help: Remove duplicate '#' in CMP0053 valid character listChristoph Grüninger2014-12-011-1/+1
| | |/ / | |/| |
* | | | Merge branch 'fix-source-case-matching' into releaseBrad King2014-11-261-1/+2
|\ \ \ \
| * | | | Fix lookup of source names after conversion to their actual case (#15259)Brad King2014-11-261-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~688^2~15 (cmTarget: Add a method to obtain list of filenames for sources, 2014-03-17) we have code paths that lookup sources by strings containing their own full path after normalization to the actual case on disk. This fails in the case that a cmSourceFile has already been created with a different case in the filename. The comparison of the directory works because it is always normalized. Only the comparison of the file name fails. Fix this by using a case-insensitive comparison of source file names on platforms that do not have case-sensitive filesystems.
* | | | Merge branch 'revert-cached-regex-clear' into releaseBrad King2014-11-265-60/+43
|\ \ \ \
| * | | | Revert "ClearMatches: Only clear matches which were actually set" (#15261)Ben Boeckel2014-11-265-60/+43
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit v3.1.0-rc1~557^2~2 (ClearMatches: Only clear matches which were actually set, 2014-03-12). The optimization did not track the match count in the same scope as the variables, allowing possible inconsistency. Resolve conflicts in Source/cmIfCommand.cxx, Source/cmMakefile.cxx, and Source/cmMakefile.h by moving the changes to the new location of the code involved.
* | | | Merge branch 'FindwxWidgets-new-versions' into releaseBrad King2014-11-261-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | FindwxWidgets: Add versions 3.0.1 and 3.0.2Christopher Gittner2014-11-261-0/+2
| |/ /
* | | Merge branch 'C-features-Wundef' into releaseBrad King2014-11-264-4/+18
|\ \ \