summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmSourceFileLocation: Use a const cmMakefile.Stephen Kelly2014-01-222-6/+6
|
* cmMakefile: Make GetProperty const.Stephen Kelly2014-01-222-15/+16
|
* Merge topic 'cmake-rerun-depends'Brad King2014-01-2210-0/+87
|\ | | | | | | | | | | 82d43175 Allow projects to specify extra inputs to CMake 1ef444d6 Add test case to verify CMake does not re-run on first build
| * Allow projects to specify extra inputs to CMakeBrad King2014-01-2110-0/+64
| | | | | | | | | | | | | | Define a new 'CMAKE_CONFIGURE_DEPENDS' directory property that projects can use to specify input files to the CMake configuration process. Extend the RunCMake.Configure test to verify that the build system re-runs CMake when this input changes.
| * Add test case to verify CMake does not re-run on first buildBrad King2014-01-213-0/+23
| | | | | | | | | | | | Extend the RunCMake.Configure with a case to verify that the CMake configuration process does not immediately re-run the first time that the generated build system is invoked.
* | Merge topic 'cmake-E-sleep'Brad King2014-01-229-1/+41
|\ \ | |/ | | | | | | 94389f63 cmake: Add '-E sleep' command
| * cmake: Add '-E sleep' commandBrad King2014-01-219-1/+41
| | | | | | | | Add a cmake command-line interface to provide a cross-platform 'sleep'.
* | Merge topic 'qcc-id'Brad King2014-01-2215-27/+117
|\ \ | | | | | | | | | | | | | | | e00db59d QNX: Introduce QCC compiler id for that QNX platform compiler. d2dea79b CMakeDetermine*Compiler: Fix typo 'lile' => 'like'
| * | QNX: Introduce QCC compiler id for that QNX platform compiler.Stephen Kelly2014-01-2211-23/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce policy CMP0047 to control resetting the id for compatibility. De-duplicate content in the QNX platform file by including the GNU one. QNX is a form of GNU platform. Do not clear CMAKE_SHARED_LIBRARY_${lang}_FLAGS variables. They are populated again later by the Compiler/GNU.cmake file anyway. Modify the CMAKE_CXX_COMPILE_OBJECT variable only when the QCC compiler id is in use, and the language is CXX. Use the QNX recommended flag for QCC instead of the gcc compatible -x flag. Populate new module files to handle system includes and depfiles when using the QCC compiler. Remove code which unsets the system include and depfiles related variables. When a GNU driver is used instead of the QCC one, the appropriate flags will be used. These variables were previously cleared for lowest-common-denominator compatibility with both drivers.
| * | CMakeDetermine*Compiler: Fix typo 'lile' => 'like'Stephen Kelly2014-01-224-4/+4
| | |
* | | CMake Nightly Date StampKitware Robot2014-01-221-1/+1
| |/ |/|
* | Merge topic 'cmake-E-symlink-replace-dangling'Brad King2014-01-219-15/+56
|\ \ | | | | | | | | | | | | e0228e2b cmake: Improve '-E create_symlink' edge case handling (#14713)
| * | cmake: Improve '-E create_symlink' edge case handling (#14713)Brad King2014-01-209-15/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic added by commit ffc0b5e4 (Overwrite the symlink if it already exists, 2007-02-15) does not recognize and remove existing broken links before replacing them. Improve the logic to remove any existing destination file or link (but not directory). On failure, report an error message explaining why the existing path could not be removed or the new one could not be created. Add a RunCMake.CommandLine test to cover 'cmake -E' cases. Start with test cases covering 'cmake -E create_symlink' behavior on UNIX platforms.
* | | Merge topic 'improve-Tests-RunCMake'Brad King2014-01-213-47/+84
|\ \ \ | |/ / | | | | | | | | | | | | d4ca30ae Tests/RunCMake: Add function to run a specified command-line 392a6553 Tests/RunCMake: Move documentation to a README.rst
| * | Tests/RunCMake: Add function to run a specified command-lineBrad King2014-01-202-11/+32
| | | | | | | | | | | | | | | | | | | | | Add a 'run_cmake_command' function that can be used by tests to run a given command-line and check the results rather than always running a CMake configuration process. This can be used in the future to test 'cmake -E' for example.
| * | Tests/RunCMake: Move documentation to a README.rstBrad King2014-01-202-36/+52
| |/
* | Merge topic 'osx-host-arch'Brad King2014-01-211-1/+6
|\ \ | | | | | | | | | | | | 9d2a0900 OS X: Use 'uname -m' for processor (#14712)
| * | OS X: Use 'uname -m' for processor (#14712)Brad King2014-01-201-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 2412d9bc (Use 'uname -m' for processor on Cygwin, 2010-09-21) it was pointed out that POSIX requires 'uname -m' but not 'uname -p': http://www.opengroup.org/onlinepubs/9699919799/utilities/uname.html On OS X x86_64, 'uname -p' returns i386 while 'uname -m' returns x86_64. Since the latter is the POSIX-compliant option trust its value. However, on OS X ppc, 'uname -m' returns 'Power Macintosh' so add a special-case to convert that to 'powerpc'.
* | | CMake Nightly Date StampKitware Robot2014-01-211-1/+1
| |/ |/|
* | Merge topic 'KateDontRequireVariable'Brad King2014-01-201-1/+1
|\ \ | | | | | | | | | | | | e02cdba0 Kate: use cmMakefile::GetSafeDefinition() for a not-required variable
| * | Kate: use cmMakefile::GetSafeDefinition() for a not-required variableAlex Neundorf2014-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | ...otherwise the generator failed in embedded projects via externalproject(), since there CMAKE_KATE_MAKE_ARGUMENT is not set. Using GetSafeDefinition() is good enough to protect against NULL-pointers. Alex
* | | Merge topic 'update-qt4-docs'Brad King2014-01-205-373/+212
|\ \ \ | |_|/ |/| | | | | | | | f81e67c6 Help: Update Qt4 documentation.
| * | Help: Update Qt4 documentation.Stephen Kelly2014-01-155-373/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove independent doc listing for Qt4ConfigurationSettings, Qt4Macros and UseQt4. These are implementation details. Recommend the use of IMPORTED targets. Remove references to the UseQt4 file, which is obsolete in light of the IMPORTED targets. Add documentation for automatic tool invocation and options. Remove reference to variables which should not be needed in modern implementations.
* | | CMake Nightly Date StampKitware Robot2014-01-201-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-01-191-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2014-01-181-1/+1
| | |
* | | Merge topic 'hppa-binutils-flag'Brad King2014-01-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 8f2c2ccb Improve ld flags for CMake itself on Linux/HPPA
| * | | Improve ld flags for CMake itself on Linux/HPPAGuy Martin2014-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workaround binutils bug by only marking unique section starting by ".text._". This adds the HPPA workaround improved in commit b22a0f15 (bootstrap: improve ld flag for Linux/HPPA builds, 2014-01-14) not only to the bootstrap, but also to the normal build.
* | | | Merge topic 'xcode-storyboard-view'Brad King2014-01-171-7/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 1ce02ebf Xcode: Fix storyboard view d9f1f917 Xcode: Remove dead code
| * | | | Xcode: Fix storyboard viewRuslan Baratov2014-01-161-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Images and xib files must have 'lastKnownFileType' attribute to be displayed correctly. If xib file has attribute 'explicitFileType' it is displayed as raw xml. If static image has attribute 'explicitFileType' it is displayed as question mark on storyboard.
| * | | | Xcode: Remove dead codeRuslan Baratov2014-01-161-4/+0
| |/ / / | | | | | | | | | | | | | | | | Variable 'ext' already checked for equality to "xib" so remove the branch that will never be executed.
* | | | Merge topic 'doc-osx-vars'Brad King2014-01-177-7/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 45056264 Help: Document CMAKE_OSX_* variables
| * | | | Help: Document CMAKE_OSX_* variablesBrad King2014-01-167-7/+52
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation entries for variables CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT Explain what each does and when/how they should be set.
* | | | Merge topic 'cmmakefile-const'Brad King2014-01-1726-59/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c768e398 cmMakefile: make some methods take const std::string& instead of const char*
| * | | | cmMakefile: make some methods take const std::string& instead of const char*Rolf Eike Beer2014-01-1626-59/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most callers already have a std::string, on which they called c_str() to pass it into these methods, which internally converted it back to std::string. Pass a std::string directly to these methods now, avoiding all these conversions. Those methods that only pass in a const char* will get the conversion to std::string now only once.
* | | | | CMake Nightly Date StampKitware Robot2014-01-171-1/+1
| |/ / / |/| | |
* | | | Merge topic 'GNUInstallDirs_debian-multiarch-fix'Brad King2014-01-161-5/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 620939e4 GNUInstallDirs: Fix CMAKE_INSTALL_LIBDIR on Debian
| * | | | GNUInstallDirs: Fix CMAKE_INSTALL_LIBDIR on DebianDaniele E. Domenichelli2014-01-151-5/+59
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When not installing in /usr (i.e. /usr/local) on Debian/Ubuntu, the multiarch path is not in ldconfig path, and therefore libraries cannot be found, unless the user manually modifies the files in /etc/ld.so.conf.d, in order to include /usr/local/lib/<arch>. This patch fixes this issue by using "lib/<arch>" only if the user is installing the software in /usr, and uses "lib" in all the other cases.
* | | | Merge topic 'fix-help-if-typo'Brad King2014-01-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5968b6e0 Help: Fix typo in 'if()' command documentation
| * | | | Help: Fix typo in 'if()' command documentationRaphael Kubo da Costa2014-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | s/argumemnts/arguments/
* | | | | Merge topic 'ninja_fix_rerun'Brad King2014-01-161-3/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 20e595ab Revert "Ninja: Track configured files so we can regenerate them."
| * | | | | Revert "Ninja: Track configured files so we can regenerate them."Brad King2014-01-151-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 4a6397a7 (Ninja: Track configured files so we can regenerate them, 2013-06-17). The files reported by the method cmMakefile::GetOutputFiles() must cause CMake to re-run only if they are missing and without considering a timestamp. This is not the meaning of the implicit dependencies field so Ninja re-runs CMake too often. Another solution will have to be found to the original problem.
* | | | | | Merge topic 'revert-ninja_fix_rerun'Brad King2014-01-161-24/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79859689 Revert "Ninja: Avoid re-running CMake on next build after regeneration"
| * | | | | | Revert "Ninja: Avoid re-running CMake on next build after regeneration"Brad King2014-01-151-24/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 6fac24d7 (Ninja: Avoid re-running CMake on next build after regeneration, 2014-01-09). The files reported by the method cmMakefile::GetOutputFiles() must cause CMake to re-run only if they are missing and without considering a timestamp. Therefore they cannot be listed as outputs of the re-run rule or Ninja will re-run CMake every time because the timestamp of configure_file outputs does not change. Another solution will have to be found to the original problem.
* | | | | | | Merge topic 'var-type-autofill'Brad King2014-01-164-16/+62
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfec180d cmake-gui: Remember variable type in Add Entry
| * | | | | | | cmake-gui: Remember variable type in Add EntrySergey Zolotarev2014-01-164-16/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store variable types together with their names in the variable completion list so that the type is automatically recovered when you select a variable. Keep variable names and types in separate lists. This removes the :TYPE string from completion list and the Name field and makes variable search easier. The variable names and types are now kept in two different settings - AddVariableNames and AddVariableTypes. Drop the old AddVariableCompletionEntries setting.
* | | | | | | | CMake Nightly Date StampKitware Robot2014-01-161-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge topic 'skip-return-code'Brad King2014-01-159-1/+77
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | 3a0d164b allow to mark a test as "Not Run" with a specific return code (#8466)
| * | | | | | allow to mark a test as "Not Run" with a specific return code (#8466)Rolf Eike Beer2014-01-149-1/+77
| | | | | | |
* | | | | | | Merge topic 'hppa-bootstrap'Brad King2014-01-151-4/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b22a0f15 bootstrap: improve ld flag for Linux/HPPA builds
generated by cgit v0.12 at 2025-01-11 17:40:55 (GMT)