summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindGettext: Fix name of GETTEXT_PROCESS_POT_FILE in docs (#15162)Brad King2014-09-181-1/+1
| | | | | | Rename GETTEXT_PROCESS_POT to GETTEXT_PROCESS_POT_FILE. Patch-by: maahnat@gmail.com
* CMake 3.0.2v3.0.2Brad King2014-09-081-1/+1
|
* Merge branch 'ExternalProject-download-loop' into releaseBrad King2014-09-081-0/+1
|\
| * ExternalProject: Avoid infinite loop on file download hash mismatchAlan W. Irwin2014-09-081-0/+1
| | | | | | | | | | | | When the loop was added by commit v3.0.0-rc1~103^2~3 (ExternalProject: Reattempt download when verification fails, 2015-01-15), we forgot to actually increment the loop counter. Add the increment line.
* | Merge branch 'fix-clang-cross-compile-find-binutils' into releaseBrad King2014-09-052-2/+6
|\ \
| * | Fix finding binutils when cross-compiling with ClangBrad King2014-09-052-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.0.0-rc1~342^2~2 (Add compiler target compile options, 2013-05-19) we use CMAKE_<LANG>_COMPILER_TARGET as the binutils prefix when cross-compiling with Clang. Fix the implementation to use the compiler target as the prefix only when it is set. Otherwise toolchain files not using CMAKE_<LANG>_COMPILER_TARGET cause the logic to use a prefix of just "-" and of course cannot find "-ar" or "-ld".
* | | Merge branch 'backport-xcode-duplicate-file-refs' into releaseBrad King2014-09-031-6/+4
|\ \ \
| * | | Xcode: Generate per-target file references (#15111)Brad King2014-09-031-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode requires a separate PBXFileReference for each target source group that references a source file. Xcode 6 now diagnoses re-use of the same PBXFileReference from multiple source groups. Add the referencing target name to our internal map key so we use a per-target reference.
* | | | Merge branch 'fix-lexer-open-square' into releaseBrad King2014-08-184-35/+51
|\ \ \ \
| * | | | cmListFileLexer: Fix lexing of single '[' character (#15092)Brad King2014-08-184-35/+51
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The lexer changes in commit v3.0.0-rc1~495^2 (Add Lua-style long brackets and long comments to CMake language, 2013-08-06) accidentally left out matching '[' as a single character in an unquoted argument. Add a lexer rule to match it and extend the RunCMake.Syntax test to cover this case.
* | | | Merge branch 'doc-CMP0022-compat-version-typo' into releaseBrad King2014-08-131-1/+1
|\ \ \ \
| * | | | CMP0022: Fix version documented to support LINK_PUBLIC/LINK_PRIVATEBrad King2014-08-131-1/+1
| | |/ / | |/| | | | | | | | | | These have been available since 2.8.7, not 2.8.9 as the docs said.
* | | | Merge branch 'backport-OpenRISC-1000-support' into releaseBrad King2014-08-112-0/+8
|\ \ \ \
| * | | | KWSys CPU: Add support for OpenRISC 1000Christian Svensson2014-08-071-0/+4
| | | | |
| * | | | KWIML: Teach ABI.h about OpenRISC 1000Christian Svensson2014-08-071-0/+4
| |/ / / | | | | | | | | | | | | It defines __or1k__ and is big endian.
* | | | Merge branch 'backport-BundleUtilities-os9-newlines' into releaseBrad King2014-08-111-0/+1
|\ \ \ \
| * | | | BundleUtilities: Allow Info.plist files which use CR line endingsTim Blechmann2014-08-071-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | Convert \r to our internal end-of-line character just as we do \n. Signed-off-by: Tim Blechmann <tim@klingt.org>
* | | | Merge branch 'backport-fix-CMP0047-IS_GNU-vars' into releaseBrad King2014-08-111-0/+8
|\ \ \ \
| * | | | CMP0047: Fix CMAKE_COMPILER_IS_GNU(CC|CXX) in OLD behaviorBrad King2014-08-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of CMP0047 detects the QNX compiler id internally, then changes it to GNU after the language is fully enabled. This is too late to correctly set the old IS_GNU variables, so set them as part of the policy OLD behavior. Reported-by: Mike Lattanzio <mlattanzio@blackberry.com>
* | | | | Merge branch 'fix-Qt-Autogen' into releaseBrad King2014-08-118-7/+84
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | QtAutogen: Fix use of multiple ui files in a single target.Stephen Kelly2014-03-256-6/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't store a mapping of the directory to the ui file. The directory will be a unique key, allowing only one ui file to be specified. Use the source file name instead as the mapping key.
| * | | | QtAutogen: Use the basename for resource files.Stephen Kelly2014-03-254-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rcc tool generates a cpp file with a symbol called qInitResources or called qInitResources_${name}, if the name is passed. The qInitResources symbol clashes if multiple qrc files are used in one target. Always pass the name to ensure that the symbol is unique. This is also the behavior of the qtx_add_resource macros.
* | | | | CMake 3.0.1v3.0.1Brad King2014-07-301-1/+1
| | | | |
* | | | | Merge branch 'check-flag-avoid-semicolon' into releaseBrad King2014-07-301-1/+1
|\ \ \ \ \
| * | | | | Check*CompilerFlag: Avoid ';' in common pattern (#15048)Brad King2014-07-301-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.0.0-rc1~551^2~1 (Check*CompilerFlag: make C and CXX modules share most error patterns, 2013-08-08) a pattern containing a ';' was moved out of a ""-quoted argument and into a variable. CMake flattens the containing list and breaks the pattern. Use a '.' to match ';'.
* | | | | Merge branch 'FindQt4-more-plugins' into releaseBrad King2014-07-281-3/+3
|\ \ \ \ \
| * | | | | FindQt4: Add nativewifi and qtga pluginsMathieu MARACHE2014-07-281-3/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | While at it, update QT_QTGUI_PLUGINS to use QT_IMAGEFORMATS_PLUGINS instead of duplicating the list.
* | | | | Merge branch 'xcode-6-librarian-flags' into releaseBrad King2014-07-282-5/+24
|\ \ \ \ \
| * | | | | Xcode: Fix static library creation for Xcode 6 (#15038)Brad King2014-07-282-5/+24
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 6 introduced an 'OTHER_LIBTOOLFLAGS' setting for the "Other Librarian Flags" of a static library. Now 'OTHER_LDFLAGS' are ignored. Teach the Xcode generator to choose the correct name for the build setting based on the type of target and the version of Xcode. Inspired-by: Jamie Kirkpatrick <jkp@spotify.com>
* | | | | Merge branch 'backport-kwsys-qnx-fix' into releaseBrad King2014-07-171-1/+4
|\ \ \ \ \
| * | | | | KWSys SystemInformation: No SA_RESTART on QNXBob E2014-07-171-1/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNX not support SA_RESTART signal: /* #define SA_RESTART 0x0040 (not supported yet) */ Use it in SystemInformation only if it is defined.
* | | | | Merge branch 'compile-with-cray' into releaseBrad King2014-07-171-1/+1
|\ \ \ \ \
| * | | | | cmcurl: Fix a build failure with the Cray compiler on Linux (#15026)Chuck Atkins2014-07-171-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error is caused by a workaround for UNICOS. The workaround incorrectly uses the _CRAYC macro to determine if building for UNICOS. This macro will always be defined for the Cray C and C++ compiler regardless of the target platform, even when building for Linux. The correct macro should be _CRAY, which as per Cray documentation is only defined for UNICOS targeted builds.
* | | | | Merge branch 'fix-QCC-compile-flags' into releaseBrad King2014-07-176-27/+41
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | QNX: Add missing flags for configurations and artifact creation.Stephen Kelly2014-07-176-27/+41
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit v3.0.0-rc1~111^2 (QNX: Introduce QCC compiler id for that QNX platform compiler., 2014-01-20) split handling of the QNX QCC compiler into a separate compiler-id. That refactoring results in the QCC compiler not using the CMake-compiler-id "GNU", which means that the __compiler_gnu macro is no longer executed for it. Add Compiler/QCC*.cmake modules to define and call the __compiler_qcc macro and teach it to call __compiler_gnu internally. Remove the corresponding pieces from the Platform/QNX*.cmake modules. It is also necessary to change the language conditional to dereference the lang macro parameter, which is another bug introduced by the same commit. The extra -lang-c++ flag is only necessary when the CXX compiler is specified as 'qcc' instead of 'QCC' in the toolchain file, which is why this bug was not noticed before. The flag is also necessary in that case when linking in order to find the appropriate standard libraries. The flag was not previously added when linking executables, so linking failed even with CMake 2.8.12 with the lower-case compiler-id. Co-Author: Brad King <brad.king@kitware.com>
* | | | Merge branch 'wince-fix-dll-linking' into releaseBrad King2014-07-101-4/+6
|\ \ \ \
| * | | | MSVC: Fix linking of DLLs on WinCE (#15013)Brad King2014-07-101-4/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | On WinCE we must link both shared libraries and executables with the /subsystem:windowsce flag. Teach Platform/Windows-MSVC to pass it to the linker in both cases. Suggested-by: Gunnar Roth <gunnar.roth@gmx.de>
* | | | Merge branch 'install-cfbundle-directory' into releaseBrad King2014-07-101-0/+14
|\ \ \ \
| * | | | OS X: Install CFBundles as complete directoriesTim Blechmann2014-07-101-0/+14
| |/ / / | | | | | | | | | | | | | | | | Install CFBundles as directories just like frameworks and application bundles.
* | | | Merge branch 'CMakeExpandImportedTargets-CMP0045' into releaseBrad King2014-07-071-2/+10
|\ \ \ \
| * | | | CMakeExpandImportedTargets: Do not read property on non-target (#15008)Brad King2014-07-071-2/+10
| |/ / / | | | | | | | | | | | | | | | | Avoid behavior that is disallowed by CMP0045. Check whether a target exists before trying to read its properties.
* | | | Merge branch 'UseSWIG-fix-noproxy-check' into releaseBrad King2014-06-251-1/+1
|\ \ \ \
| * | | | UseSWIG: Fix check for noproxy flag (#14990)Brad King2014-06-251-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for this flag added by commit v3.0.0-rc1~284^2 (UseSWIG: Name python module according to swig flags, 2013-11-26) can get false positives on flags like "-noproxydel". Improve the check to match only "-noproxy". Suggested-by: Garth Wells <gnw20@cam.ac.uk>
* | | | Merge branch 'bootstrap-cmake-locations' into releaseBrad King2014-06-252-4/+12
|\ \ \ \
| * | | | bootstrap: Fix "make test" and "make package" targets (#14989)Brad King2014-06-252-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.0.0-rc1~374^2 (Refactor internal resource location APIs and initialization, 2013-11-07) a bootstrap-built "cmake" tries to reference "ctest" and "cpack" executables next to itself, which never exist. Teach cmSystemTools::FindCMakeResources, when bootstrap-built, to refer to the "ctest" and "cpack" executables in the location where they will be built after "make".
| * | | | bootstrap: Clarify name of configured source directoryBrad King2014-06-252-4/+4
| |/ / / | | | | | | | | | | | | | | | | Rename CMAKE_ROOT_DIR to CMAKE_BOOTSTRAP_SOURCE_DIR to clarify both that it is only for bootstrap and that it refers to the source directory.
* | | | Merge branch 'gfortran-compressed-modules' into releaseBrad King2014-06-231-14/+27
|\ \ \ \
| * | | | Fortran: Add support for GNU >= 4.9 compressed modules (#14975)Brad King2014-06-231-14/+27
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the GCC 4.9 release notes for Fortran: https://gcc.gnu.org/gcc-4.9/changes.html "Module files: The version of the module files (.mod) has been incremented; additionally, module files are now compressed." Teach cmDependsFortran::ModulesDiffer to look for the gzip magic numbers at the beginning of the module file. If found, assume the module was produced by gfortran >= 4.9. The modules do not appear to contain the date as earlier versions did so we can compare the content directly and do not actually need to decompress.
* | | | Merge branch 'ninja-avoid-double-phony' into releaseBrad King2014-06-161-0/+9
|\ \ \ \
| * | | | Ninja: Remove CMake includes from explicit depends (#14972)Adam Strzelecki2014-06-161-0/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It may happen that CMake include is an explicit dependency for some command, while all CMake includes are set phony in WriteTargetRebuildManifest, this may lead to duplicate phony generate rules which causes ninja warnings. We need to remove implicit CMake includes in WriteUnknownExplicitDependencies. This fixes FindCUDA ninja warnings.
generated by cgit v0.12 at 2025-09-06 07:53:15 (GMT)