summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Recognize the Texas Instruments DSP compiler (#11645)Wojciech Migda2010-12-283-0/+9
| | | | | | | | | | | | The TI DSP compiler predefines "__TI_COMPILER_VERSION__". Use this to identify the C and C++ compilers. For assembler language the C compiler executable is used: $ cl6x -h TMS320C6x C/C++ Compiler v6.1.11 Tools Copyright (c) 1996-2009 Texas Instruments Incorporated Use this command-line option and output to recognize the assembler.
* Merge topic 'cygwin'Brad King2010-12-211-1/+45
|\ | | | | | | | | | | | | | | | | 85c0a69 Cygwin: Do not define 'WIN32' (#10122) 62c6d2d Merge branch 'cmake_--system-information_min-version' into cygwin 72db20f Merge branch 'tests-if-CYGWIN' into cygwin 5adef16 Merge branch 'cygwin-module-prefix' into cygwin cbc3258 Merge branch 'try-compile-min-version' into cygwin
| * Cygwin: Do not define 'WIN32' (#10122)Brad King2010-12-171-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of Cygwin's goals is to build projects using the POSIX API with no Windows awareness. Many CMake-built projects have been written to test for UNIX and WIN32 but not CYGWIN. The preferred behavior under Cygwin in such projects is to take the UNIX path but not the WIN32 path. Unfortunately this change is BACKWARDS INCOMPATIBLE for Cygwin-aware CMake projects! Some projects that previously built under Cygwin and are Cygwin-aware when they test for WIN32 may now behave differently. Eventually these projects will need to be updated, but to help users build them in the meantime we print a warning about the change in behavior. Furthermore, one may set CMAKE_LEGACY_CYGWIN_WIN32 to request old behavior during the transition. Normally we avoid backwards incompatible changes, but we make an exception in this case for a few reasons: (1) This behavior is preferred by Cygwin's design goals. (2) A warning provides a clear path forward for everyone who may see incompatible behavior, and CMAKE_LEGACY_CYGWIN_WIN32 provides a compatibility option. The warning and compatibility option both disappear when the minimum required version of CMake in a project is sufficiently new, so this issue will simply go away over time as projects are updated to account for the change. (3) The fixes required to update projects are fairly insignificant. Furthermore, the Cygwin distribution has no releases itself so project versions that predate said fixes tend to be difficult to build anyway. (4) This change enables many CMake-built projects that did not previously build under Cygwin to work out-of-the-box. From bug #10122: "I have built over 120 different source packages with (my patched) CMake, including most of KDE4, and have found that NOT defining WIN32 on Cygwin is much more accurate." -- Yaakov Selkowitz A fully compatible change would require patches on top of these project releases for Cygwin even though they otherwise need not be aware of it. (5) Yaakov has been maintaining a fork of CMake with this change for the Cygwin Ports distribution. It works well in practice. By accepting the change in upstream CMake we avoid confusion between the versions. CMake itself builds without WIN32 defined on Cygwin. Simply disable CMAKE_LEGACY_CYGWIN_WIN32 explicitly in our own CMakeLists.txt file.
| * Merge branch 'cmake_--system-information_min-version' into cygwinBrad King2010-12-171-1/+2
| |\
* | \ Merge topic 'cmake_--system-information_min-version'Brad King2010-12-211-1/+2
|\ \ \ | | |/ | |/| | | | | | | a6cb1d4 Declare min CMake version in --system-information project
| * | Declare min CMake version in --system-information projectBrad King2010-12-171-1/+2
| | | | | | | | | | | | | | | The --system-information flag's project triggered a CMP0000 warning because the CMakeLists.txt it generates needs cmake_minimum_required.
* | | Merge topic 'CheckCCompilerFlag-strict-prototypes'Brad King2010-12-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | b3efdb5 CheckCCompilerFlag: Strict signature of 'main' (#11615)
| * | | CheckCCompilerFlag: Strict signature of 'main' (#11615)Brad King2010-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use "int main(void)" instead of just "int main()" so that compiling with "gcc -Werror=strict-prototypes" works. Test this check using the flags "-Werror -Wstrict-prototypes" to work with old GCC versions.
* | | | Merge topic 'gnu-compiler-windows-info'Brad King2010-12-211-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e8d380f Remove unused old-style g++ info file
| * | | | Remove unused old-style g++ info fileBrad King2010-12-161-1/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Since commit aff31479 (Modernize GNU compiler info on Windows, 2009-12-02) the file Modules/Platform/Windows-g++.cmake has been unused. It just includes the non-existent Modules/Platform/Windows-gcc.cmake so remove it outright.
* | | | Merge topic 'intel-compiler-windows-info'Brad King2010-12-219-189/+118
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | cd43636 Modernize Intel compiler info on Windows 58c73c4 Detect Fortran target architecture on Windows
| * | | | Modernize Intel compiler info on WindowsBrad King2010-12-166-192/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves Intel compiler info on Windows into new-style modules Platform/Windows-Intel-<lang>.cmake using language-independent helper module Platform/Windows-Intel.cmake to define macros consolidating the information.
| * | | | Detect Fortran target architecture on WindowsBrad King2010-12-164-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 4430bccc (Change the way 32/64 bit compiles are detected with MSVC and intel, 2009-11-19) added detection of the target processor to C and CXX language builds with MS and Intel tools. Do the same for Intel Fortran for Windows (ifort). Use /machine:<arch> to link executables.
* | | | | Merge topic 'intel-config-definitions'Brad King2010-12-211-10/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | 3fb088e Make Intel defines consistent with MSVC on Windows (#9904)
| * | | | Make Intel defines consistent with MSVC on Windows (#9904)Brad King2010-12-151-10/+10
| |/ / / | | | | | | | | | | | | | | | | Add /DWIN32 and /D_WINDOWS to default config-independent flags. Add /D[_N]DEBUG to default flags for each configuration.
* | | | Merge topic 'FindBLAS_FindLAPACK'Brad King2010-12-211-18/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | cabafa3 ACML find fixes (issue 0011219) 4f00763 FindBLAS works in C/C++ projects without Fortran
| * | | | ACML find fixes (issue 0011219)Alexey Ozeritsky2010-12-161-1/+12
| | | | |
| * | | | FindBLAS works in C/C++ projects without FortranAlexey Ozeritsky2010-12-161-17/+12
| |/ / /
* | | | Merge topic 'cygwin-module-prefix'Brad King2010-12-161-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | 1dcc977 Cygwin: Use 'cyg' prefix for module DLLs (#10122)
| * | | Cygwin: Use 'cyg' prefix for module DLLs (#10122)Yaakov Selkowitz2010-12-131-1/+1
| | |/ | |/| | | | | | | Cygwin now uses the prefix 'cyg' for plugin DLLs instead of 'lib'.
* | | Merge topic 'NAG-Fortran'Brad King2010-12-168-23/+81
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09d1c10 FortranCInterface: Recognize NAG Fortran module symbols af2ad90 Add NAG Fortran compiler information files 24cc3d4 Recognize the NAG Fortran compiler 83892c4 Allow Fortran platform files to set empty values fe3f878 Detect object files in implicit link information
| * | | FortranCInterface: Recognize NAG Fortran module symbolsBrad King2010-12-091-0/+2
| | | |
| * | | Add NAG Fortran compiler information filesBrad King2010-12-093-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Linux the NAG Fortran compiler uses gcc under the hood to link. Use "-Wl,-v" to pass "-v" to the underlying gcc compiler to get verbose link output. Detect the NAG Fortran directory (using -dryrun) and then honor object files in the directory referenced in the implicit link line. Pass real linker options with "-Wl,-Xlinker,". The -Wl, gets through the NAG front-end and the -Xlinker gets through the gcc front-end.
| * | | Recognize the NAG Fortran compilerBrad King2010-12-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | The Numerical Algorithms Group (NAG) Fortran compiler does not document a preprocessor macro to identify it. Check for identifying output using the -V option.
| * | | Allow Fortran platform files to set empty valuesBrad King2010-12-091-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach CMakeFortranInformation to use default flags only for variables that have not been set at all, rather then not set or empty. This will allow platform or compiler-specific information files to set empty values without getting the defaults.
| * | | Detect object files in implicit link informationBrad King2010-12-092-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | The NAG Fortran compiler implicitly passes object files by full path to the linker. Teach CMakeParseImplicitLinkInfo to parse object files that match some tool-specific regular expression.
* | | | CPackSTGZ quote here-doc, fix bug10518Eric NOULARD2010-12-151-1/+1
| |_|/ |/| |
* | | 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
| | |
generated by cgit v0.12 at 2025-01-16 04:35:06 (GMT)