summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'external-project-args-file'Brad King2010-12-141-1/+52
|\ | | | | | | | | | | | | 3bc828d Fixed bug where last entry would be lost. b316087 Escape file write expansion, and build up lists. 68cd3fe Added CMAKE_CACHE_ARGS to ExternalProject.
| * Fixed bug where last entry would be lost.Marcus D. Hanwell2010-12-131-0/+5
| | | | | | | | | | The code to build up a list was missing the final entry in an initial cache.
| * Escape file write expansion, and build up lists.Marcus D. Hanwell2010-12-111-12/+25
| | | | | | | | | | | | | | | | Escaped the @var@ in the file writes - this was being expanded at file write and so not causing a reconfigure at the right time. I also took care of build up lists of lists in the variables, especially important for things like MPI_EXTRA_LIBRARY. Added some error checking, and use the tmp_dir for initial cache file.
| * Added CMAKE_CACHE_ARGS to ExternalProject.Marcus D. Hanwell2010-12-101-0/+33
| | | | | | | | | | | | | | | | | | | | | | On Windows the limit for command line arguments is 8192 characters, and this was limiting longer paths with some of our more nested projects such as Library. Placing the -D arguments into CMAKE_CACHE_ARGS will write out an initial cache file, that will be passed to CMake with a -C argument as the initial cache. By forcing the cache variables we preserve the existing behavior with -D, to change the values of cache variables in our inner projects.
* | Merge topic 'CPackRPM-Fix0011595'Brad King2010-12-141-3/+2
|\ \ | | | | | | | | | | | | 8d366cd CPackRPM fix bug 0011595 : Can't generate RPMs (on FC11...)
| * | CPackRPM fix bug 0011595 : Can't generate RPMs (on FC11...)Eric NOULARD2010-12-131-3/+2
| |/
* | Merge topic 'ParallelEclipseMakefiles2'Brad King2010-12-141-0/+6
|\ \ | | | | | | | | | | | | | | | 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-121-0/+2
| |/ | | | | | | | | | | | | | | 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 '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 'fix_incremental_vs2010'Brad King2010-12-141-0/+2
|\ \ | | | | | | | | | | | | cddcad5 Fix incremental linking for VS2010 with nmake or make.
| * | Fix incremental linking for VS2010 with nmake or make.Bill Hoffman2010-12-091-0/+2
| |/ | | | | | | | | | | 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 'FixDocTypoInFindFLEX'Brad King2010-12-141-2/+2
|\ \ | | | | | | | | | | | | 3ce0049 Fix typos in the doc
| * | Fix typos in the docAlex Neundorf2010-12-071-2/+2
| |/ | | | | | | Alex
* | 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 'qt4-deps-tiff-jpeg-mng'Brad King2010-12-021-3/+20
|\ | | | | | | | | bd66cc9 Fix build issues cross compiling with static Qt.
| * Fix build issues cross compiling with static Qt.Clinton Stimpson2010-11-231-3/+20
| | | | | | | | Also fix case where system jpeg, png, tiff libs are used.
* | Merge topic 'bundleutils-rpath-removal'Brad King2010-12-021-6/+6
|\ \ | |/ |/| | | | | 28c1be7 BundleUtilities: only do rpath strip on copied prerequisites.
| * BundleUtilities: only do rpath strip on copied prerequisites.Clinton Stimpson2010-11-231-6/+6
| |
* | Merge topic 'FindITK-use-find_package'David Cole2010-11-231-61/+17
|\ \ | | | | | | | | | | | | 38b0a84 Modernize FindITK module (#11494)
| * | Modernize FindITK module (#11494)Brad King2010-11-221-61/+17
| |/ | | | | | | | | | | | | Use the Config mode of find_package to search for ITKConfig. This makes FindITK a thin-wrapper around a standard find_package, bringing benefits like searching lib64 paths when appropriate. This does for FindITK what commit 2c1a01dc (Modernize FindVTK module, 2009-10-07) did for FindVTK.
* | Merge topic 'pgi-mac'David Cole2010-11-231-4/+4
|\ \ | | | | | | | | | | | | eda7841 Pass Mac linker flag through PGI compiler using "-Wl,"
| * | Pass Mac linker flag through PGI compiler using "-Wl,"Brad King2010-11-221-4/+4
| |/ | | | | | | | | | | | | The Mac linker defines -headerpad_max_install_names and the GCC front-end passes this flag through. The PGI compiler does not know about this flag, so we must use -Wl,-headerpad_max_install_names to pass it to the linker instead.
* | Merge topic '11384'David Cole2010-11-231-1/+6
|\ \ | | | | | | | | | | | | 0263d8d 11384: FindCxxTest now includes test code in VS project
| * | 11384: FindCxxTest now includes test code in VS projectPhilip Lowman2010-11-191-1/+6
| |/ | | | | | | | | The test code header files are now included in the test target so they will show up under "Header Files" in Visual Studio targets, for example.
* | Merge topic '11430'David Cole2010-11-231-2/+3
|\ \ | | | | | | | | | | | | a44a05c 11430: FindBullet doesn't find header files installed by Bullet >= 2.77
| * | 11430: FindBullet doesn't find header files installed by Bullet >= 2.77Philip Lowman2010-11-191-2/+3
| |/
* | Merge topic 'IncludeCMakeDetermineCompilerIdInDetermineASMCompiler'David Cole2010-11-231-0/+1
|\ \ | | | | | | | | | | | | e3dfbf6 Include CMakeDetermineCompilerId in CMakeDetermineASMCompiler.cmake (#11467)
| * | Include CMakeDetermineCompilerId in CMakeDetermineASMCompiler.cmake (#11467)Alex Neundorf2010-11-171-0/+1
| |/ | | | | | | | | | | | | | | | | CMakeDetermineASMCompiler.cmake relied on that somebody else (usually during enabling C or CXX) already included that file, and broke if that was not the case. Thanks to Louis for the patch Alex
* | Merge topic 'spelling'David Cole2010-11-231-1/+1
|\ \ | | | | | | | | | | | | 8f1798c Modules: Fix spelling 'becase' -> 'because'.
| * | Modules: Fix spelling 'becase' -> 'because'.Andrius Štikonas2010-11-171-1/+1
| |/
* | Merge topic 'CPackRPM-ComponentSupport'David Cole2010-11-231-13/+24
|\ \ | | | | | | | | | | | | | | | 66e86b4 CPack fix kwstyle breakage and make CPackRPM backward compatible 2c84d16 CPackRPM add basic component support to CPackRPM
| * | CPackRPM add basic component support to CPackRPMEric NOULARD2010-11-131-13/+24
| | | | | | | | | | | | | | | basic means 1 RPM per component and no dependency handling this implies some CPackGenerator refactoring
* | | Merge topic 'AddASM_NASMSupport'David Cole2010-11-236-12/+109
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0b6016 Some more fixes for nasm support, from Etienne (#10069) d25c2eb Use CMAKE_ASM_NASM_FLAGS for nasm instead of FLAGS e614e9b Add support for yasm, a nasm compatible assembler 79dd9be We already have 2010, fix copyright year. ffeca06 Add missing copyright headers 7b337ac Improve misleading comments. e1fc9b9 Add support for nasm assembler, patch by Peter Collingbourne (see #10069)
| * | | Some more fixes for nasm support, from Etienne (#10069)Alex Neundorf2010-11-121-17/+19
| | | | | | | | | | | | | | | | Alex
| * | | Use CMAKE_ASM_NASM_FLAGS for nasm instead of FLAGSAlex Neundorf2010-10-211-1/+1
| | | | | | | | | | | | | | | | Alex
| * | | Add support for yasm, a nasm compatible assemblerAlex Neundorf2010-10-212-3/+3
| | | | | | | | | | | | | | | | Alex
| * | | We already have 2010, fix copyright year.Alex Neundorf2010-09-273-3/+3
| | | | | | | | | | | | | | | | Alex
| * | | Add missing copyright headersAlex Neundorf2010-09-273-0/+42
| | | | | | | | | | | | | | | | Alex
| * | | Improve misleading comments.Alex Neundorf2010-09-253-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | (the assembler is not really tested) Alex
| * | | Add support for nasm assembler, patch by Peter Collingbourne (see #10069)Alex Neundorf2010-09-253-0/+52
| | | | | | | | | | | | | | | | Alex
* | | | Merge topic 'moc-includes-regex'David Cole2010-11-231-4/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | 35b91ac Fix regex for moc includes when looking for frameworks.
| * | | Fix regex for moc includes when looking for frameworks.Clinton Stimpson2010-08-021-4/+4
| | | |
* | | | Merge topic 'EP-extra-generator'David Cole2010-11-161-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 74e49aa BUG 11451 - pass CMAKE_EXTRA_GENERATOR down.
| * | | | BUG 11451 - pass CMAKE_EXTRA_GENERATOR down.Marcus D. Hanwell2010-11-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the behavior of external projects with respect to generators using the CMAKE_EXTRA_GENERATOR variable.
* | | | | Merge topic 'cray-compiler'David Cole2010-11-166-0/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53e76c8 Teach CMake about Cray C, C++, and Fortran compilers 34e1ac2 Create Fortran info variables for .mod behavior
generated by cgit v0.12 at 2025-01-10 12:40:38 (GMT)