summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'xcode-target-depends'Brad King2013-02-203-51/+19
|\ | | | | | | | | | | b005140 Xcode: Each target dependency edge needs a unique object (#13935) 781ea6d Xcode: Drop check for circular target dependencies
| * Xcode: Each target dependency edge needs a unique object (#13935)Brad King2013-02-193-33/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | Generate a unique PBXTargetDependency and PBXContainerItemProxy for every edge in the dependency graph as required by the Xcode format. Xcode only accidentally loads project files that re-use the same PBXTargetDependency for every edge leading to a single target. If one is removed by hand in the IDE then Xcode may crash due to dangling references from the others. Since cmGlobalXCodeGenerator::AddDependTarget is called exactly once for every edge in the target dependency graph we do not need to keep track of which edges have been visited to avoid generating duplicates.
| * Xcode: Drop check for circular target dependenciesBrad King2013-02-191-18/+0
| | | | | | | | | | | | The modern cmComputeTargetDepends guarantees there will by no cycles. Drop the Xcode generator's check which only handled length 1 and 2 cycles anyway.
* | Merge topic 'compiler-change-cleanup'Brad King2013-02-2015-18/+106
|\ \ | | | | | | | | | | | | | | | | | | | | | e83e6a1 Test Unix Makefiles generator support for changing compilers c307e1c Tests/RunCMake: Allow tests to control build tree behavior 2963c98 Merge branch 'empty-compiler-crash' into compiler-change-cleanup 1df09e5 Delete entire CMakeFiles directory when deleting CMakeCache.txt (#13756)
| * | Test Unix Makefiles generator support for changing compilersBrad King2013-02-2013-0/+92
| | | | | | | | | | | | | | | | | | Add RunCMake.CompilerChange test to cover use of -DCMAKE_C_COMPILER=cc to change the compiler of an existing build tree. Also test for proper failure with -DCMAKE_C_COMPILER="" and no CC in the environment.
| * | Tests/RunCMake: Allow tests to control build tree behaviorBrad King2013-02-181-2/+6
| | | | | | | | | | | | | | | Teach the run_cmake to allow tests to set a custom test build directory. Also add an option to skip removing the build directory.
| * | Merge branch 'empty-compiler-crash' into compiler-change-cleanupBrad King2013-02-18785-6345/+17145
| |\ \
| * | | Delete entire CMakeFiles directory when deleting CMakeCache.txt (#13756)Brad King2013-02-181-16/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e015df7d (...delete CMakeFiles directory when cache is deleted, 2006-02-20) we deleted the files in the CMakeFiles directory when deleting CMakeCache.txt in order to reset the build tree to a fresh state. This allowed commit fd33bf93 (fix for bug 6102, allow users to change the compiler, 2007-12-13) to delete CMakeCache.txt when the user changes the compiler and CMakeFiles/CMake<lang>Compiler.cmake and other platform information files would go with it to allow a fresh start. Then commit 7195aca5 (Make platform information files specific to the CMake version, 2012-08-24) moved the platform information files to a subdirectory e.g. CMakeFiles/<version>/CMake<lang>Compiler.cmake where <version> is the current CMake version. This causes the compiler change logic to fail to remove all old compiler information. Then on the next configuration CMake<lang>Compiler.cmake would set CMAKE_<lang>_COMPILER back to the old value and re-trigger the compiler change logic. This causes an infinite loop of cache deletion and compiler reset. Fix this simply by teaching cmCacheManager::DeleteCache to remove the entire CMakeFiles directory recursively whenever it removes an existing CMakeCache.txt. This fully resets the build tree to configure with a fresh compiler.
* | | | Merge topic 'ide-compiler-vars-cleanup'Brad King2013-02-203-8/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bed6c38 VS,Xcode: Remove unused CMAKE_GENERATOR_* variables
| * | | | VS,Xcode: Remove unused CMAKE_GENERATOR_* variablesBrad King2013-02-193-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the topic merged to master by commit 34a02846 (Merge topic 'ide-compiler-id', 2012-08-24), these variables are not used by CMakeDetermine*Compiler.cmake for VS and Xcode generators. Drop the code that sets them.
* | | | | Merge topic 'NAG-Fortran-PIC'Brad King2013-02-201-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c26ac22 NAG: Use -PIC for Fortran position-independent code (#13932)
| * | | | | NAG: Use -PIC for Fortran position-independent code (#13932)Neil Carlson2013-02-181-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | The Numerical Algorithms Group (NAG) Fortran compiler documents -PIC for position-independent code.
* | | | | Merge topic 'xcode-organize-sources'Brad King2013-02-201-2/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6a8983 Xcode: Sort source files 0816cae Xcode: Fix nested source group handling (#12943)
| * | | | | Xcode: Sort source filesAlexander Chehovsky2013-02-181-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Xcode doesn't sort the files on its own, let's sort them in our generator to make navigation easier. Visual Studio, QtCreator, and kdevelop all display files sorted.
| * | | | | Xcode: Fix nested source group handling (#12943)Alexander Chehovsky2013-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the code path for nested sources build the group map key in the same way as non-nested code path does.
* | | | | | CMake Nightly Date StampKitware Robot2013-02-201-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'ninja-custom-command-implicit'Brad King2013-02-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bbea30e Ninja: remove implicit dependency on custom command outputs
| * | | | | Ninja: remove implicit dependency on custom command outputsPeter Kümmel2013-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert aa2e1e9caef92b10083a03c2ded5c937703e69b8 With this commit all files are rebuild when only one moc file has changed. BUG 0013874
* | | | | | Merge topic 'sublime-text-2-generator'Brad King2013-02-194-0/+598
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f616ff2 Update generator to use new cmGeneratorTarget api. 674bd6e Merge branch 'master' into sublime-text-2-generator 4760ead Remove ability to generate sublime clang files. da0898e Correct missing parameter to CMP0018Flags call. badb40d Merge branch 'master' into sublime-text-2-generator b3ae61f Merge branch 'master' into sublime-text-2-generator 089d9cc SublimeText 2 Gen: Set the sublimeclang_options_script property. 44c2eee Merge branch 'master' into sublime-text-2-generator 304b885 Sublime Text 2 Gen: Per-source Compile flags are now saved in a separate file. 5b2aa3d SublimeText2 Gen: Fixed the issue where include directory flags used -D 90bcb77 SublimeText2 Gen: Improved use of define, include flags from CMAKE_C(XX)_FLAGS cc84072 Merge branch 'master' into sublime-text-2-generator 8670cbe Define flags in CMAKE_C(XX)_FLAGS are now included in SublimeClang settings. d022d4e Merge branch 'master' into sublime-text-2-generator 9cd3e70 Fixed Sublime Text project generation for in-source builds 44f35f7 Added a CMAKE_SUBLIMECLANG_DISABLED variable that disables SublimeClang. ...
| * | | | | | Update generator to use new cmGeneratorTarget api.Robert Maynard2013-02-191-11/+14
| | | | | | |
| * | | | | | Merge branch 'master' into sublime-text-2-generatorRobert Maynard2013-02-19125-505/+2300
| |\ \ \ \ \ \
| * | | | | | | Remove ability to generate sublime clang files.Robert Maynard2013-02-193-109/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SublimeClang is a optional plugin to SublimeText and I felt it shouldn't be part of the generator for the following reasons: 1. Reduces the amount of sublime and sublimeClang specific code we have to maintain inside CMake. 2. In testing the SublimeClang commands generated did not work for the VTK project. For people that do want this feature I recommend that they looking into https://gist.github.com/robertmaynard/4724705 for a way to use CMAKE_EXPORT_COMPILE_COMMANDS to generate JSON files that can be used by SublimeClang.
| * | | | | | | Correct missing parameter to CMP0018Flags call.Robert Maynard2013-02-191-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into sublime-text-2-generatorRobert Maynard2013-02-19277-3158/+7118
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflict in Source/cmDocumentVariables.cxx by adding both variables.
| * \ \ \ \ \ \ \ Merge branch 'master' into sublime-text-2-generatorMorné Chamberlain2012-11-24128-989/+1542
| |\ \ \ \ \ \ \ \
| * | | | | | | | | SublimeText 2 Gen: Set the sublimeclang_options_script property.Morné Chamberlain2012-11-242-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sublimeclang_options_script property is now set in the project file. It is set to execute a python script that reads the JSON options file to get options per source file. Python must be installed and in the path for this feature to work from Sublime Text.
| * | | | | | | | | Merge branch 'master' into sublime-text-2-generatorMorné Chamberlain2012-11-11134-740/+2479
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Sublime Text 2 Gen: Per-source Compile flags are now saved in a separate file.Morné Chamberlain2012-11-112-160/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer write sublimeclang_options to the project file, but instead write a separate .sublimeclang-options JSON file that contains a map of source file paths to compile flags for that file.
| * | | | | | | | | | SublimeText2 Gen: Fixed the issue where include directory flags used -DMorné Chamberlain2012-11-071-1/+1
| | | | | | | | | | |
| * | | | | | | | | | SublimeText2 Gen: Improved use of define, include flags from CMAKE_C(XX)_FLAGSMorné Chamberlain2012-11-042-19/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both define and include flags from CMAKE_C(XX)_FLAGS are now included in SublimeClang options. Include directories are now used with absolute paths instead of relative paths since CMake generated build trees cannot be moved anyway.
| * | | | | | | | | | Merge branch 'master' into sublime-text-2-generatorMorné Chamberlain2012-11-0453-1059/+2004
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Define flags in CMAKE_C(XX)_FLAGS are now included in SublimeClang settings.Morné Chamberlain2012-10-182-19/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the the SublimeText2 generator name to Sublime Text 2. Fixed a minor issue where if the build directory was outside of the source directory an unnecessary folder_exclude_pattern was generated in the Sublime Text 2 project file.
| * | | | | | | | | | | Merge branch 'master' into sublime-text-2-generatorMorné Chamberlain2012-10-1778-186/+933
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed Sublime Text project generation for in-source buildsMorné Chamberlain2012-10-141-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the issue where for in-source builds the source directory (which is also the build directory) was excluded from the project file.
| * | | | | | | | | | | | Added a CMAKE_SUBLIMECLANG_DISABLED variable that disables SublimeClang.Morné Chamberlain2012-10-142-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the CMAKE_SUBLIMECLANG_DISABLED variable is on then SublimeClang is disabled in the generated project file. This is useful in large projects where SublimeClang might run slowly or perform poorly.
| * | | | | | | | | | | | The generator no longer generates absolute paths to the ninja.build/Makefiles.Morné Chamberlain2012-10-141-5/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | The generator no longer generates an explicit list of source files.Morné Chamberlain2012-10-142-154/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the source directory is simply added to the project file, with the output/build directory excluded.
| * | | | | | | | | | | | Added and cleaned up some comments.Morné Chamberlain2012-10-132-3/+13
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed support for the Ninja build system.Morné Chamberlain2012-10-131-10/+31
| | | | | | | | | | | | |
| * | | | | | | | | | | | Cleaned up the Sublime Text 2 Generator code a bit.Morné Chamberlain2012-10-132-86/+130
| | | | | | | | | | | | |
| * | | | | | | | | | | | Changed SublimeClang include path generation to expand to absolute paths.Morné Chamberlain2012-10-131-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed an issue where compiler definitions for SublimeClang were not written to the project file.
| * | | | | | | | | | | | Added some support for sublimeclang_options in the generated project file.Morné Chamberlain2012-10-132-8/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds -I include path flags and -D define flags for sublimeclang. The current problem with this is that these flags cannot be set per target (build_system in sublime text), it can only be set project wide. Currently all of the include paths and compiler definitions from ALL of the targets are used (with duplicates removed). This could be problematic in some cases (conflicting compiler definitions among targets).
| * | | | | | | | | | | | Added a generator for Sublime Text 2 project files.Morné Chamberlain2012-10-134-0/+456
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generator adds all list and source files for each defined project. The generated project files also include build_system entries that run the platform-specific make on the generated Makefiles. A build_system entry is created for each target that was defined in the CMakeLists.txt files. At the moment this has only been tested with C/C++ projects.
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-02-191-1/+1
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-02-181-1/+1
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-02-171-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-02-161-1/+1
| |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | Merge topic 'vs-atomic-generated-stamp'Brad King2013-02-151-3/+12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2dc17f8 VS: Replace generation timestamp file atomically
| * | | | | | | | | | VS: Replace generation timestamp file atomicallyBrad King2013-02-121-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 34c882a9 (Allow VS 7 project Rebuild and Solution Rebuild to work, 2007-11-10) we use a "CMakeFiles/generated.stamp" and some associated files in the build tree to avoid re-running CMake when the inputs have not changed but VS has cleaned the outputs it knows about. When we do not really need to re-run we restore the generated.stamp file. The non-re-run case can happen in multiple targets in parallel in VS >= 10 so we must restore the file atomically to avoid races. Write the stamp file to a random temporary name and then atomically rename it to the real stamp file.
* | | | | | | | | | | Merge topic 'rpath-use-implicit-link-dirs'Brad King2013-02-153-4/+53
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95a9c80 Merge topic 'LINK_LIBRARIES-property' into rpath-use-implicit-link-dirs baa33ac AIX-GNU: Put implicit link directories in runtime libpath (#13909) 171b099 Avoid duplicate RPATH entries