summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ReworkedAsmSupport'Brad King2011-03-0816-17/+177
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3ce420 Do not bother enabling C++ in Assembler test 80f6a34 Teach Assembler test to generate main.s at build time 1dafa74 Fix Assembler test to parse C flags string before using 4139a73 -only enable the asm test for the Intel compiler if we are under UNIX 1f6c6b1 -use CMAKE_C_FLAGS when generating the assembler file d0f71e2 Add ASM platform information for HP compiler on HP bd580be Merge branch 'hp-compiler-info' into ReworkedAsmSupport a0bab7a Add ASM platform information for XL compiler on AIX c03b610 Merge branch 'aix-xl-platform-info' into ReworkedAsmSupport c623008 Initialize ASM rpath flags for executables with those for shared libs 17c658f Add support for the Intel compiler used for ASM under Windows 4258b24 Add more regex for gcc, always print the ASM compiler ID 9071b8b Add temporary debug output for compiler ID detection for ASM 48f7199 It's ELSEIF(), not ELSIF() d103c75 Fix bad comparison in the detect assembler-code 20fe0be Only try assembler support for Makefile-based generators 8614470 Use a regexp instead a lot of ORs for checking the compiler ID cf88092 The Assembler test now tests ASM for GNU, Intel, HP, XL and SunPro 66614a8 Add assemble- and preprocess commands for HP 78f7c59 Fix the default CMAKE_ASM_COMPILE_OBJECT, make XL-ASM use it 7456461 Change the default rules so they fit better to the new ASM handling 5542d58 Set the HP asm file suffix f745220 Add support for ASm for the HP compiler. 00735d4 Add suport for ASM for the IBM XL compiler d3e9e8a Add support for ASM for the SunPro compiler 64e66eb Actually use CMAKE_ASM_COMPILER for asm, instead of CMAKE_C_COMPILER 38f92bf Add ASM support for the Intel compiler 4b40d42 Rework the way assembler is handled, use the C/CXX compiler by default
| * Add ASM platform information for HP compiler on HPBrad King2011-03-022-0/+7
| | | | | | | | | | Among other flags this sets RPATH flags correctly so that CMake knows how to treat CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH for the ASM language.
| * Merge branch 'hp-compiler-info' into ReworkedAsmSupportBrad King2011-03-025-65/+67
| |\
| * | Add ASM platform information for XL compiler on AIXBrad King2011-03-021-0/+2
| | | | | | | | | | | | | | | Among other flags this sets RPATH flags correctly so that CMake knows how to treat CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH for the ASM language.
| * | Merge branch 'aix-xl-platform-info' into ReworkedAsmSupportBrad King2011-03-0217-171/+145
| |\ \
| * | | Initialize ASM rpath flags for executables with those for shared libsBrad King2011-03-021-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the flags for executables are almost always the same as those for shared libraries each language information file just uses the latter for the former by default. This reduces duplication in the compiler and platform flag information files.
| * | | Add support for the Intel compiler used for ASM under WindowsAlex Neundorf2011-03-022-1/+7
| | | | | | | | | | | | | | | | Alex
| * | | Add more regex for gcc, always print the ASM compiler IDAlex Neundorf2011-03-011-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | Now gcc is also recognized via "Free Software Foundation" Alex
| * | | Add temporary debug output for compiler ID detection for ASMAlex Neundorf2011-03-011-0/+7
| | | | | | | | | | | | | | | | Alex
| * | | It's ELSEIF(), not ELSIF()Alex Neundorf2011-03-011-1/+1
| | | | | | | | | | | | | | | | Alex
| * | | Fix bad comparison in the detect assembler-codeAlex Neundorf2011-03-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | (there was a if("${CMAKE_C_COMPILER}") instead of if(CMAKE_C_COMPILER) ) Alex
| * | | Add assemble- and preprocess commands for HPAlex Neundorf2011-02-232-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Also restore HP-C.cmake, I had accidentially overwritten it with HP-ASM.cmake Alex
| * | | Fix the default CMAKE_ASM_COMPILE_OBJECT, make XL-ASM use itAlex Neundorf2011-02-232-3/+1
| | | | | | | | | | | | | | | | Alex
| * | | Change the default rules so they fit better to the new ASM handlingAlex Neundorf2011-02-235-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMAKE_ASM_COMPILE_OBJECT is now so that it fits for GNU, Intel, HP and Sun ASM_ATT had to be adjusted. Also adjusted the default CMAKE_ASM_LINK_EXECUTABLE Alex
| * | | Set the HP asm file suffixAlex Neundorf2011-02-231-0/+2
| | | | | | | | | | | | | | | | Alex
| * | | Add support for ASm for the HP compiler.Alex Neundorf2011-02-233-1/+9
| | | | | | | | | | | | | | | | Alex
| * | | Add suport for ASM for the IBM XL compilerAlex Neundorf2011-02-232-0/+19
| | | | | | | | | | | | | | | | Alex
| * | | Add support for ASM for the SunPro compilerAlex Neundorf2011-02-232-0/+30
| | | | | | | | | | | | | | | | Alex
| * | | Actually use CMAKE_ASM_COMPILER for asm, instead of CMAKE_C_COMPILERAlex Neundorf2011-02-231-1/+1
| | | | | | | | | | | | | | | | Alex
| * | | Add ASM support for the Intel compilerAlex Neundorf2011-02-233-1/+16
| | | | | | | | | | | | | | | | Alex
| * | | Rework the way assembler is handled, use the C/CXX compiler by defaultAlex Neundorf2011-01-304-7/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes the way how the assembler support works in cmake. The language "ASM" now always uses the C/Cxx compiler instead of the assembler directly. This fixes #8392, assembler files are not preprocessed. If one wants to use the assembler directly, the specific assembler "dialect" has to be enabled. I.e. to get as/gas, you have to use now ASM-ATT, the same way for ASM_MASM and ASM_NASM. Implemented this now for gcc. SunStudio, IBM, HP and Intel still todo. Alex
* | | | Merge topic 'improve-ExternalProject-file-name-recognition'Brad King2011-03-081-4/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7f10b13 ExternalProject: Extract file names from more urls
| * | | | ExternalProject: Extract file names from more urlsDavid Cole2011-03-041-4/+9
| | | | | | | | | | | | | | | | | | | | Notably, downloads from sourceforge.net and gitweb snapshots.
* | | | | Merge topic 'aix-xl-platform-info'Brad King2011-03-086-14/+36
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | | | | | d30dcf1 Move RPATH flags to AIX per-compiler information files 89ea7a3 Factor AIX and XL compiler flags into common module
| * | | Move RPATH flags to AIX per-compiler information filesBrad King2011-03-023-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Move RPATH flags out of Platform/AIX.cmake into platform-specific compiler information files Platform/AIX-XL and Platform/AIX-GNU. The flags need to be set for each compiler of each language.
| * | | Factor AIX and XL compiler flags into common moduleBrad King2011-03-024-12/+32
| |/ / | | | | | | | | | | | | Factor duplicate flag information from Platform/AIX-XL-*.cmake into Platform/AIX-XL.cmake and load it from the original files.
* | | Factor HP compiler flags into per-platform/per-compiler filesBrad King2011-03-025-65/+67
|/ / | | | | | | | | | | | | Move HP flags out of Platform/HP-UX.cmake into platform-specific compiler information files "Platform/HP-UX-HP-<lang>.cmake". Factor common values into "Platform/HP-UX-HP.cmake" and load it from the per-language files.
* | Merge topic 'doc-typo-fixes'Brad King2011-03-013-5/+3
|\ \ | | | | | | | | | | | | 7c5e412 Documentation: Fix a few typos (#11883)
| * | Documentation: Fix a few typos (#11883)Modestas Vainius2011-02-223-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 10029: warning [p 158, 13.5i]: can't break line I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz informations information I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz dependant dependent I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz prefered preferred I: cmake: spelling-error-in-binary ./usr/bin/cmake prefered preferred I: cmake: spelling-error-in-binary ./usr/bin/cpack prefered preferred I: cmake: spelling-error-in-binary ./usr/bin/ctest prefered preferred I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakepolicies.1.gz prefered preferred I: cmake-curses-gui: spelling-error-in-binary ./usr/bin/ccmake prefered preferred I: cmake-qt-gui: spelling-error-in-binary ./usr/bin/cmake-gui prefered preferred
* | | Merge topic 'qt4-setversion-regression-43cb9b8'Brad King2011-03-011-0/+5
|\ \ \ | | | | | | | | | | | | | | | | 6b9bc54 Fix regression in 43cb9b8.
| * | | Fix regression in 43cb9b8.Clinton Stimpson2011-02-241-0/+5
| |/ / | | | | | | | | | Put back some code for setting the QT_VERSION_* variables that wasn't supposed to be removed.
* | | Merge topic 'mingw-module-definition'Brad King2011-02-241-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | 6c4b249 Fix Fortran test .def file symbol mangling 7616216 Pass .def files directly to MinGW tools (#9997)
| * | Pass .def files directly to MinGW tools (#9997)Brad King2011-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 6a61a8a5 (Honor module .def files with MinGW tools, 2011-02-21) set CMAKE_LINK_DEF_FILE_FLAG to "-Wl," to enable passing .def files to the linker on MinGW. However, older GNU tools in the MSYS shell do not know how to translate "-Wl,/c/..." to "c:/..." and complain that the file does not exist. Instead set the flag to just "" which tells CMake it can pass the file through the front-end with no special flag.
* | | Merge topic 'qt4-fphsa'Brad King2011-02-221-133/+52
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7a1027a When checking find_package() components, special case qtmain. 4c1c358 FindQt4: Include builtin FindPackageHandleStandardArgs directly 43cb9b8 Change to use fphsa to check required variables and version.
| * | | When checking find_package() components, special case qtmain.Clinton Stimpson2011-02-041-1/+7
| | | | | | | | | | | | | | | | | | | | Its just a library on Windows only. Fixes bug #11791.
| * | | FindQt4: Include builtin FindPackageHandleStandardArgs directlyBrad King2011-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | Apply to FindQt4 change from commit b0118402 (Use absolute path to FindPackageHandleStandardArgs.cmake everywhere, 2010-09-28).
| * | | Change to use fphsa to check required variables and version.Clinton Stimpson2011-01-151-133/+46
| | | | | | | | | | | | | | | | | | | | Also, set the required variables based on components, if specified. Also, don't make finding uic required if not using QtGui.
* | | | Merge topic 'mingw-module-definition'Brad King2011-02-221-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | 6a61a8a Honor module .def files with MinGW tools (#9997)
| * | | Honor module .def files with MinGW tools (#9997)Brad King2011-02-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 024d05ad (Fix use of module .def files for MS tools, 2009-09-29) module .def files work for any platform that sets CMAKE_LINK_DEF_FILE_FLAG correctly. Set it in the Windows-GNU platform information file to enable support with MinGW tools. Also enable the test added by commit 0db2c850 (Test use of module .def files for MS tools, 2009-09-29) for MinGW and MSYS generators.
* | | | Merge topic 'qt4-macfind'Brad King2011-02-221-4/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4167be0 Fix issues with find_path() for QtCore include dir on Mac. Fixes 11868.
| * | | | Fix issues with find_path() for QtCore include dir on Mac. Fixes 11868.Clinton Stimpson2011-02-191-4/+21
| |/ / /
* | | | Merge topic 'init-LDFLAGS-issue-11840'Brad King2011-02-221-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3b77516 Fix linker flag initialization from LDFLAGS (#11840)
| * | | | Fix linker flag initialization from LDFLAGS (#11840)Brad King2011-02-111-3/+3
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | When initializing CMAKE_(EXE|SHARED|MODULE)_LINKER_FLAGS from LDFLAGS and CMAKE_(EXE|SHARED|MODULE)_LINKER_FLAGS_INIT quote the whole string in case both are set. Reported-by: Daniel R. Gomez <gomez@teragram.com>
* | | | Merge topic 'fix-4564-make-test-alias'Brad King2011-02-221-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 816c9d1 CTest: Add alias for make test target (#4564)
| * | | | CTest: Add alias for make test target (#4564)David Cole2011-02-011-0/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | Clients may define CTEST_TEST_TARGET_ALIAS in a project's initial cache to get a target of another name that executes the same underlying command as "make test"
* | | | Merge topic 'fix-10723-non-dev-xcode'Brad King2011-02-221-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d421a43 Strip trailing space from xcode-select output (#10723)
| * | | | Strip trailing space from xcode-select output (#10723)David Cole2011-02-011-1/+2
| |/ / / | | | | | | | | | | | | | | | | Otherwise, subsequent use of the output does not work as intended.
* | | | Merge topic 'mpif77-workaround-o-c-order'Brad King2011-02-221-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 93f230e Pass -o after -c for Fortran to avoid mpif77 ordering bug
| * | | | Pass -o after -c for Fortran to avoid mpif77 ordering bugBrad King2011-01-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running $ mpif77 -c example.f -o example.f.o mpif77 recognizes -o and produces example.f.o, but when running $ mpif77 -o example.f.o -c example.f the -o option is ignored and the object file is example.o. Performing the same experiment on the underlying compiler tool or with the mpicc and mpiCC wrappers does not exhibit this behavior, so the issue appears to be specific to mpif77. Reported-by: Zhen Wang <zwang26@emory.edu>
* | | | | Merge topic 'fix-10150-mark-timeout-advanced'Brad King2011-02-221-10/+11
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | b5e3692 CTest: Mark DART_TESTING_TIMEOUT as advanced (#10150)