Brad King
831fef8167
Merge topic 'improve-ExternalProject-file-name-recognition'
...
7f10b13 ExternalProject: Extract file names from more urls
2011-03-08 14:22:35 -05:00
Brad King
8a8234df05
Merge topic 'aix-xl-platform-info'
...
d30dcf1 Move RPATH flags to AIX per-compiler information files
89ea7a3 Factor AIX and XL compiler flags into common module
2011-03-08 14:22:13 -05:00
David Cole
7f10b137e1
ExternalProject: Extract file names from more urls
...
Notably, downloads from sourceforge.net and gitweb snapshots.
2011-03-04 17:09:41 -05:00
Brad King
d0f71e2545
Add ASM platform information for HP compiler on HP
...
Among other flags this sets RPATH flags correctly so that CMake knows
how to treat CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH for the ASM language.
2011-03-02 17:49:17 -05:00
Brad King
bd580be526
Merge branch 'hp-compiler-info' into ReworkedAsmSupport
2011-03-02 17:40:55 -05:00
Brad King
5f0a25955f
Factor HP compiler flags into per-platform/per-compiler files
...
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.
2011-03-02 17:24:36 -05:00
Brad King
a0bab7ae69
Add ASM platform information for XL compiler on AIX
...
Among other flags this sets RPATH flags correctly so that CMake knows
how to treat CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH for the ASM language.
2011-03-02 13:48:04 -05:00
Brad King
c03b610c0a
Merge branch 'aix-xl-platform-info' into ReworkedAsmSupport
2011-03-02 13:47:11 -05:00
Brad King
c623008376
Initialize ASM rpath flags for executables with those for shared libs
...
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.
2011-03-02 13:44:13 -05:00
Brad King
d30dcf18b9
Move RPATH flags to AIX per-compiler information files
...
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.
2011-03-02 11:21:54 -05:00
Brad King
89ea7a3d3c
Factor AIX and XL compiler flags into common module
...
Factor duplicate flag information from Platform/AIX-XL-*.cmake into
Platform/AIX-XL.cmake and load it from the original files.
2011-03-02 11:20:50 -05:00
Alex Neundorf
17c658f819
Add support for the Intel compiler used for ASM under Windows
...
Alex
2011-03-02 16:46:25 +01:00
Alex Neundorf
4258b24134
Add more regex for gcc, always print the ASM compiler ID
...
Now gcc is also recognized via "Free Software Foundation"
Alex
2011-03-01 22:58:26 +01:00
Alex Neundorf
9071b8b87f
Add temporary debug output for compiler ID detection for ASM
...
Alex
2011-03-01 21:41:02 +01:00
Alex Neundorf
48f7199df0
It's ELSEIF(), not ELSIF()
...
Alex
2011-03-01 21:39:19 +01:00
Brad King
bb745612bc
Merge topic 'doc-typo-fixes'
...
7c5e412 Documentation: Fix a few typos (#11883 )
2011-03-01 15:30:32 -05:00
Brad King
79037a818e
Merge topic 'qt4-setversion-regression-43cb9b8'
...
6b9bc54 Fix regression in 43cb9b8.
2011-03-01 15:30:17 -05:00
Alex Neundorf
d103c751fa
Fix bad comparison in the detect assembler-code
...
(there was a if("${CMAKE_C_COMPILER}") instead of if(CMAKE_C_COMPILER) )
Alex
2011-03-01 21:28:54 +01:00
Brad King
11431c67c6
GNUInstallDirs: Simplify and clarify documentation
2011-02-28 15:15:01 -05:00
Nikita Krupen'ko
a262fe0917
Add GNUInstallDirs module to define GNU layout ( #3976 )
...
Provide CMAKE_INSTALL_* variables to help install files according
to the GNU standard layout:
http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
2011-02-28 15:15:01 -05:00
Brad King
307bdadadc
Merge topic 'mingw-module-definition'
...
6c4b249 Fix Fortran test .def file symbol mangling
7616216 Pass .def files directly to MinGW tools (#9997 )
2011-02-24 08:30:26 -05:00
Clinton Stimpson
6b9bc54566
Fix regression in 43cb9b8.
...
Put back some code for setting the QT_VERSION_* variables that wasn't supposed to be removed.
2011-02-23 17:13:49 -07:00
Alex Neundorf
66614a868d
Add assemble- and preprocess commands for HP
...
Also restore HP-C.cmake, I had accidentially overwritten it with HP-ASM.cmake
Alex
2011-02-23 21:30:21 +01:00
Alex Neundorf
78f7c592eb
Fix the default CMAKE_ASM_COMPILE_OBJECT, make XL-ASM use it
...
Alex
2011-02-23 21:29:05 +01:00
Alex Neundorf
7456461588
Change the default rules so they fit better to the new ASM handling
...
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
2011-02-23 21:21:41 +01:00
Alex Neundorf
5542d58014
Set the HP asm file suffix
...
Alex
2011-02-23 21:18:55 +01:00
Alex Neundorf
f745220a32
Add support for ASm for the HP compiler.
...
Alex
2011-02-23 21:16:44 +01:00
Alex Neundorf
00735d4055
Add suport for ASM for the IBM XL compiler
...
Alex
2011-02-23 21:16:22 +01:00
Alex Neundorf
d3e9e8a078
Add support for ASM for the SunPro compiler
...
Alex
2011-02-23 21:16:00 +01:00
Alex Neundorf
64e66ebdc8
Actually use CMAKE_ASM_COMPILER for asm, instead of CMAKE_C_COMPILER
...
Alex
2011-02-23 21:15:41 +01:00
Alex Neundorf
38f92bfbe1
Add ASM support for the Intel compiler
...
Alex
2011-02-23 21:15:18 +01:00
Brad King
761621645c
Pass .def files directly to MinGW tools ( #9997 )
...
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.
2011-02-23 11:04:17 -05:00
Modestas Vainius
7c5e412c4a
Documentation: Fix a few typos ( #11883 )
...
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
2011-02-22 17:24:51 -05:00
Brad King
62f816adde
Merge topic 'qt4-fphsa'
...
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.
2011-02-22 14:36:33 -05:00
Brad King
521d244531
Merge topic 'mingw-module-definition'
...
6a61a8a Honor module .def files with MinGW tools (#9997 )
2011-02-22 14:33:04 -05:00
Brad King
59cfdd5c77
Merge topic 'qt4-macfind'
...
4167be0 Fix issues with find_path() for QtCore include dir on Mac. Fixes 11868.
2011-02-22 14:33:00 -05:00
Brad King
c5f27110ab
Merge topic 'init-LDFLAGS-issue-11840'
...
3b77516 Fix linker flag initialization from LDFLAGS (#11840 )
2011-02-22 14:32:22 -05:00
Brad King
15ff343d23
Merge topic 'fix-4564-make-test-alias'
...
816c9d1 CTest: Add alias for make test target (#4564 )
2011-02-22 14:31:50 -05:00
Brad King
11f55fff8f
Merge topic 'fix-10723-non-dev-xcode'
...
d421a43 Strip trailing space from xcode-select output (#10723 )
2011-02-22 14:31:45 -05:00
Brad King
6e450ed7f0
Merge topic 'mpif77-workaround-o-c-order'
...
93f230e Pass -o after -c for Fortran to avoid mpif77 ordering bug
2011-02-22 14:31:40 -05:00
Brad King
e0d0e879cf
Merge topic 'fix-10150-mark-timeout-advanced'
...
b5e3692 CTest: Mark DART_TESTING_TIMEOUT as advanced (#10150 )
2011-02-22 14:31:21 -05:00
Brad King
6a61a8a538
Honor module .def files with MinGW tools ( #9997 )
...
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.
2011-02-21 14:34:54 -05:00
Clinton Stimpson
4167be052f
Fix issues with find_path() for QtCore include dir on Mac. Fixes 11868.
2011-02-19 15:30:02 -07:00
Brad King
6720f97d3b
Merge topic 'copyright-FindPerlLibs'
...
bff5772 FindPerlLibs: Add notice of copyright
2011-02-14 16:34:39 -05:00
Brad King
3b77516862
Fix linker flag initialization from LDFLAGS ( #11840 )
...
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>
2011-02-11 08:54:38 -05:00
Andreas Schneider
bff5772084
FindPerlLibs: Add notice of copyright
...
I'm the original author of this module. See bug #7898 .
2011-02-10 13:46:35 -05:00
Clinton Stimpson
7a1027a1b6
When checking find_package() components, special case qtmain.
...
Its just a library on Windows only.
Fixes bug #11791 .
2011-02-04 09:01:55 -05:00
David Cole
816c9d1aa1
CTest: Add alias for make test target ( #4564 )
...
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"
2011-02-01 15:39:02 -05:00
David Cole
d421a433a8
Strip trailing space from xcode-select output ( #10723 )
...
Otherwise, subsequent use of the output does not work
as intended.
2011-02-01 14:16:30 -05:00
Brad King
93f230e408
Pass -o after -c for Fortran to avoid mpif77 ordering bug
...
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>
2011-01-31 16:24:12 -05:00