summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ninja-fix-crash-on-error' into releaseBrad King2014-12-231-1/+4
|\
| * Ninja: Do not crash when CMAKE_<LANG>_COMPILE_OBJECT is empty (#15325)Brad King2014-12-221-1/+4
| |
* | Merge branch 'CPackComponent-docs-fix' into releaseBrad King2014-12-221-2/+2
|\ \
| * | Help: Small fixes in CPackComponent documentationDaniele E. Domenichelli2014-12-221-2/+2
| |/
* | Merge branch 'backport-suncc-fixes' into releaseBrad King2014-12-221-2/+3
|\ \
| * | Fix compilation with the Oracle / Sun compiler (#15318)Chuck Atkins2014-12-181-2/+3
| | | | | | | | | | | | | | | | | | One piece of code has some ambiguous type deduction that seems to resolve correctly for most compilers but not for the Oracle compiler. Make it more explicit.
* | | Merge branch 'doc-mingw-makefiles' into releaseBrad King2014-12-222-6/+15
|\ \ \
| * | | Help: Clarify MinGW v. MSYS Makefiles generators (#15319)Brad King2014-12-192-6/+15
| | |/ | |/| | | | | | | | | | | | | | | | Explain the usage of each generator more clearly and reference each as an alternative to the other. Suggested-by: Craig Hicks <hicks111@hotmail.com>
* | | Merge branch 'bootstrap-solaris' into releaseBrad King2014-12-181-1/+1
|\ \ \ | | |/ | |/|
| * | bootstrap: Fix syntax for Solaris 10 shell (#15317)Brad King2014-12-181-1/+1
| |/ | | | | | | | | | | | | | | In commit v3.1.0-rc2~7^2 (Workaround for short jump tables on PA-RISC, 2014-11-04) we added use of shell syntax not supported on the Solaris shell. Avoid using the '!' operator. Reported-by: Friedrich Haubensak <hsk@imb-jena.de>
* | Merge branch 'doc-INTERFACE-target-type' into releaseBrad King2014-12-171-1/+2
|\ \ | |/ |/|
| * Help: Add INTERFACE_LIBRARY to TYPE target property documentationTim Blechmann2014-12-171-1/+2
| |
* | CMake 3.1.0v3.1.0Brad King2014-12-151-1/+1
|/
* Merge branch 'doc-CMP0054-example' into releaseBrad King2014-12-121-3/+31
|\
| * Help: Extend policy CMP0054 documentation with an exampleNils Gladitz2014-12-121-3/+31
| |
* | Merge branch 'backport-doc-find-module-no-summary' into releaseBrad King2014-12-091-11/+0
|\ \ | |/ |/|
| * Help: Drop FeatureSummary example in cmake-developer.7Brad King2014-12-091-11/+0
| | | | | | | | | | | | | | | | | | The use of FeatureSummary inside a find module is not a convention yet used by upstream CMake modules. Drop the example from the documentation about how to write find modules. If in the future we add use of FeatureSummary to many of the upstream find modules then this example can be restored as part of establishing the convention.
* | 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
| | | | |