summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ParallelEclipseMakefiles2'Brad King2010-12-143-8/+18
|\ | | | | | | | | | | 27ee50a Add ECLIPSE_CDT4_GENERATE_SOURCE_PROJECT as a ADVANCED cache variable (#9631) 50d21d4 Add cache var CMAKE_ECLIPSE_MAKE_ARGUMENTS when using the Eclipse generator
| * Add ECLIPSE_CDT4_GENERATE_SOURCE_PROJECT as a ADVANCED cache variable (#9631)Alex Neundorf2010-12-131-0/+4
| | | | | | | | | | | | | | This variable has been supported since 2.6 I think, having it in the cache makes it easier to use (see bug report #9631) Alex
| * Add cache var CMAKE_ECLIPSE_MAKE_ARGUMENTS when using the Eclipse generatorAlex Neundorf2010-12-123-8/+14
| | | | | | | | | | | | | | | | This variable can be set to command line arguments which will be passed to make when eclipse invokes make, e.g. you can enter "-j8" to get 8 parallel builds (#9930) Alex
* | Merge topic 'vim-help'Brad King2010-12-141-0/+21
|\ \ | | | | | | | | | | | | ce01321 Inline help in vim with vertical split.
| * | Inline help in vim with vertical split.Matthias Kretz2010-12-131-0/+21
| | | | | | | | | | | | | | | Added a small script to open a vertical split window with the output of cmake --help-command for the word under the cursor.
* | | Merge topic 'custom-command-depend'Brad King2010-12-148-39/+54
|\ \ \ | | | | | | | | | | | | | | | | | | | | ced1d5e Skip file-level dependencies on custom targets (#11332) e30a775 Improve signature of cmLocalGenerator::GetRealDependency
| * | | Skip file-level dependencies on custom targets (#11332)Brad King2010-12-083-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A custom command may name a target created by add_custom_target in its DEPENDS field. Treat this case as a target-level dependency only since a custom target provides no standard file on which to add a file-level dependency.
| * | | Improve signature of cmLocalGenerator::GetRealDependencyBrad King2010-12-087-33/+51
| | | | | | | | | | | | | | | | Allow file-level custom command dependencies to be skipped.
* | | | Merge topic '11445-workaround'Brad King2010-12-141-28/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | a80d6e9 Add Boost 1.46 88babef [patch] Add Boost 1.45 to search, simplify a check removing VERSION_LESS
| * | | | Add Boost 1.46Philip Lowman2010-12-131-2/+2
| | | | |
| * | | | [patch] Add Boost 1.45 to search, simplify a check removing VERSION_LESSPhilip Lowman2010-12-131-28/+26
| | | | | | | | | | | | | | | | | | | | | | | | | Also some whitespace issues are cleaned up. Patch from Adam Richardson attached to #11445
* | | | | Merge topic 'vs10-sln-msbuild-workaround'Brad King2010-12-144-10/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10f01ae Remove unused parameter "root" in some VS generator methods 57e7153 Avoid msbuild idiosyncrasy that builds multiple configs (#11594) 7728172 Remove unused variable "rootdir" in VS generators
| * | | | | Remove unused parameter "root" in some VS generator methodsBrad King2010-12-103-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous commit removed the last use of this parameter from the implementation of WriteTargetsToSolution. Remove the parameter.
| * | | | | Avoid msbuild idiosyncrasy that builds multiple configs (#11594)Brad King2010-12-101-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a .sln file refers to a project file with a leading ".\", as in ".\foo.vcxproj" instead of just "foo.vcxproj" or a full path then msbuild behaves strangely. Whenever target foo is built as a dependency of another target, msbuild brings multiple configurations up to date instead of just the requested configuration! Refer to all project files by full path to avoid this behavior.
| * | | | | Remove unused variable "rootdir" in VS generatorsBrad King2010-12-102-4/+0
| | | | | |
* | | | | | Merge topic 'fix_incremental_vs2010'Brad King2010-12-142-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | cddcad5 Fix incremental linking for VS2010 with nmake or make.
| * | | | | | Fix incremental linking for VS2010 with nmake or make.Bill Hoffman2010-12-092-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS2010 deprecated /INCREMENTAL:YES. This change makes /INCREMENTAL the flag to use for incremental linking with VS2010.
* | | | | | | Merge topic 'FindTCL-version-ref'Brad King2010-12-141-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d95913e FindTCL: Fix TCL and TK version variable references (#11528)
| * | | | | | | FindTCL: Fix TCL and TK version variable references (#11528)Kai Wasserbäch2010-12-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindTCL.cmake switched variables in the FIND_LIBRARY invocation. The FIND_LIBRARY() statement for TCL used the TK variables and vice versa. This patch reverses that into the right usage. Closes debian issue 600245.
* | | | | | | | Merge topic 'cross-compile-apple-host'Brad King2010-12-141-15/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b7f901 Fix soname in cross-compiled targets with Mac host (#11547)
| * | | | | | | | Fix soname in cross-compiled targets with Mac host (#11547)Brad King2010-12-091-15/+24
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The soname generation code was compile-time selected instead of runtime selected. The result is that a Mac-compiled cmake used to cross-compile Mac -> Unix generates an soname of the form libfoo.x.y.so instead of libfoo.so.x.y as expected. Instead do a runtime check based on the target platform. Inspired-By: George Staikos <staikos@kde.org>
* | | | | | | | Merge topic 'doc-ctest_sleep'Brad King2010-12-141-5/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7145ca6 CTest: Fix ctest_sleep documentation (#11554)
| * | | | | | | | CTest: Fix ctest_sleep documentation (#11554)Brad King2010-12-091-5/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Document behavior consistently with the implementation.
* | | | | | | | Merge topic 'parallel-make-install-of-CMake'Brad King2010-12-141-0/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 608d6bb Fix parallel "make install" of CMake itself
| * | | | | | | | Fix parallel "make install" of CMake itselfBrad King2010-12-091-0/+9
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid tracing dependencies of GLOBAL_TARGET targets. The build system generators are not designed to handle any dependencies that may be discovered. Global targets are only generated by CMake and never have commands that reference targets built in the project anyway. The exception is when building CMake itself there is a special case to use the just-built "cmake" binary in the "install" target so that CMake can replace itself on Windows. Even in this special case we do not want to let the "install" target depend on the "cmake" target. Doing so breaks cases like "make -j4 install".
* | | | | | | | Merge topic 'imported-target-dependencies'Brad King2010-12-142-9/+49
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a765c49 Honor custom command dependencies on imported targets (#10395)
| * | | | | | | | Honor custom command dependencies on imported targets (#10395)Brad King2010-12-082-9/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Imported targets do not themselves build, but we can follow dependencies through them to find real targets. This allows imported targets to depend on custom targets that provide the underlying files at build time.
* | | | | | | | | Merge topic 'fix-INSTALL-and-PACKAGE-depend-tracing'Brad King2010-12-143-22/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e82773 Remove unused GLOBAL_TARGET generation code 0621362 Fix dependency tracing of INSTALL and PACKAGE (#11598)
| * | | | | | | | | Remove unused GLOBAL_TARGET generation codeBrad King2010-12-132-22/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a boolean parameter of cmGlobalGenerator::CreateGlobalTarget that is never set to true anymore. Remove global target "consolidation" loop because no global targets exist before it runs anymore.
| * | | | | | | | | Fix dependency tracing of INSTALL and PACKAGE (#11598)Brad King2010-12-131-0/+6
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit e01cce28 (Allow add_dependencies() on imported targets, 2010-11-19) started using cmMakefile::FindTargetToUse to follow dependencies, including those of GLOBAL_TARGETs like INSTALL and PACKAGE. Since global targets exist in every directory, dependencies between them must be traced within each directory too. Teach FindTargetToUse to check the current directory before checking globally. For global targets this will find the local copy. For for normal targets this will be a no-op because they are globally unique.
* | | | | | | | | Merge topic 'FixDocTypoInFindFLEX'Brad King2010-12-141-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ce0049 Fix typos in the doc
| * | | | | | | | | Fix typos in the docAlex Neundorf2010-12-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | | | | | Merge topic 'BundleUtilities-should-produce-error-if-item-is-not-embedded'Brad King2010-12-141-0/+30
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2895f4 BundleUtilities: error if fixup_bundle_item called on non-embedded item
| * | | | | | | | | | BundleUtilities: error if fixup_bundle_item called on non-embedded itemDavid Cole2010-12-061-0/+30
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, improve the documentation of the fixup_bundle and fixup_bundle_item functions to clarify that plugin type "libs" need to be copied into the bundle *before* calling fixup_bundle. Commit e93a4b4d3421ced7b8c852b76c0dcb427f798df8 changed the way that the libs parameter to fixup_bundle is interpreted. Before the commit, the libs were copied into the bundle first and then fixed up. After the commit, the copy was skipped, assuming the libs were in the bundle in the first place, and then the fixups occurred as before. However, before the commit, it was possible to name a lib from outside the bundle, and have it copied in and then fixed up. Its resolved embedded name was always inside the bundle before. After, its resolved embedded name was just the same as its resolved name, which is in its original location, and not necessarily inside the bundle. This manifested itself as a problem with the ParaView call to fixup_bundle and its many plugins. Previously, ParaView had simply passed in the list of plugin file names as they existed in the build tree, and left the copying into the bundle up to the fixup_bundle function. When built with CMake 2.8.3 (the first version to contain the above named commit) the fixup_bundle call would inadventently fixup libraries in the build tree, not libraries that were in the bundle. Furthermore, the plugins would not be in the final bundle. This points out the fact that the fix for the bugs made by the above commit was a backwards-incompatible change in behavior. This commit makes it an error to try to fixup an item that is not already inside the bundle to make the change in behavior apparent to folks who were depending on the prior copy-in behavior: now, they should get an error, and hopefully, reading the new and improved documentation, should be able to resolve it in their projects by adding code to install or copy in such libraries prior to calling fixup_bundle. Whew.
* | | | | | | | | | Merge topic 'vs10-express-64bit'Brad King2010-12-145-0/+85
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb97ba6 Enable 64-bit tools with VS 2010 Express (#9981, #10722)
| * | | | | | | | | | Enable 64-bit tools with VS 2010 Express (#9981, #10722)Brad King2010-12-015-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Express Edition does not come with 64-bit tools, but one can install the "Microsoft Windows SDK v7.1" to get them. Detect this case and check for the SDK. If found, set PlatformToolset to use the SDK tools. Otherwise, fail with a concise and informative error.
* | | | | | | | | | | KWSys: Use EXPORT name only if installing libraryBrad King2010-12-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not set KWSYS_INSTALL_LIBRARY_RULE just because the parent project set KWSYS_INSTALL_EXPORT_NAME. Require KWSYS_INSTALL_LIB_DIR to be set too.
* | | | | | | | | | | KWSys Nightly Date StampKWSys Robot2010-12-141-1/+1
| |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | KWSys Nightly Date StampKWSys Robot2010-12-131-1/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | KWSys Nightly Date StampKWSys Robot2010-12-121-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | KWSys Nightly Date StampKWSys Robot2010-12-111-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | KWSys Nightly Date StampKWSys Robot2010-12-101-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2010-12-091-1/+1
| | | | | |
* | | | | | KWSys: Remove realpath from SystemTools::GetPath (#10335)Brad King2010-12-081-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit "merge in changes for beos support" (2006-12-04) added a realpath call for every directory parsed out of a PATH-style environment variable. No reason was given in the commit message or comments. The call incorrectly resolves symlinks in referenced paths. Remove it. If BeOS support really needs it then it can be restored for that platform with a full explanation.
* | | | | | KWSys Nightly Date StampKWSys Robot2010-12-081-1/+1
| | | | | |
* | | | | | Merge topic 'fix-typo-in-error-message'David Cole2010-12-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2a997d Correct misspelling in error message text.
| * | | | | | Correct misspelling in error message text.David Cole2010-12-061-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'fortran-avoid-timestamp-touch'David Cole2010-12-071-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | 5622a16 Make Fortran $obj.provides.build targets not .PHONY
| * | | | | Make Fortran $obj.provides.build targets not .PHONYBrad King2010-12-061-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 60cd72d0 (Cleaned up generation of symbolic rules, 2006-02-15) incorrectly made these Makefile targets .PHONY even though the build rule touches an actual file. Correct it so that the copy_f90_mod and touch steps do not happen on every "make".
* | | | | KWSys Nightly Date StampKWSys Robot2010-12-071-1/+1
|/ / / /