kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,645 Commits 1 Branch 14 Tags
Commit Graph

3662 Commits

Author SHA1 Message Date
Rolf Eike Beer
f6ecb900fb Check{C,CXX}CompilerFlag: detect ICC error messages 
Patch provided by Christopher Sean Morrison.
 2012-02-23 23:08:04 +01:00
Mike McQuaid
4853e1effd Fix plugin installation issues. 2012-02-23 21:01:45 +00:00
Rolf Eike Beer
53d02ea1ea FindPythonLibs: stop scanning when libraries are found 2012-02-23 18:49:06 +01:00
Rolf Eike Beer
91d5a2a386 FindPythonLibs: put debug libraries into PYTHON_LIBRARIES 2012-02-23 18:48:24 +01:00
Rolf Eike Beer
aca1121ea6 UseSWIG: clean up string compares 2012-02-23 18:39:23 +01:00
David Cole
bada88e8e4 Merge branch 'target-include-directories' into ninja-generator 2012-02-22 16:21:48 -05:00
Rolf Eike Beer
0110262a2d FindOpenMP: simplify check for enabled languages 2012-02-22 17:47:52 +01:00
Rolf Eike Beer
c9c1a17609 FindPythonLibs: get the exact version of the found library (#3080) 2012-02-22 17:20:15 +01:00
Rolf Eike Beer
f7723786e7 FindPythonLibs: make the version selection work as for PythonInterp 2012-02-22 17:20:15 +01:00
Rolf Eike Beer
bbddaeef7e FindPython{Interp,Libs}: document Python_ADDITIONAL_VERSIONS as input 
The current documentation could be read as if that variable is output from the
module, which is nonsense.
 2012-02-22 17:20:15 +01:00
Stephen Kelly
40efa4db74 Fix documented function signature to match reality. 
The function description is already correct.
 2012-02-21 23:54:01 +01:00
David Cole
8ef15df700 Merge topic 'HandleTargetsInCMakeRequiredLibraries' 
35c48e1 Check*.cmake: Expand imported targets in CMAKE_REQUIRED_LIBRARIES
61cb4ea bootstrap: move while() and endwhile() into the bootstrap build
c9f2886 -don't pull in CheckTypeSize.cmake from the cmake which is being built
628f365 -remove trailing whitespace
 2012-02-21 15:58:27 -05:00
David Cole
bf6560091d Merge topic 'qt3-find-qtmain' 
f506621 Fix paths/hints for finding qtmain.
 2012-02-21 15:58:06 -05:00
David Cole
7d02020d68 Merge topic 'CPack-dynamicDocSection' 
9a8103e Try to fix compile error on Win32-vs70
4da2223 Fix typo in end markup
cfac874 More documentation concerning CPack Components
dee0a38 Put CPack DMG and PackageMaker doc in separate files
b4abcfe Correct copy/paste section name mistake
9717727 Suppress unecessary (now empty) doc sections
7a8f44a Add structure documentation for CPack Bundle generator
b8a274c Add structured documentation for NSIS
a6bce55 Dynamically add documentation section specified in documented script.
 2012-02-21 15:57:17 -05:00
David Cole
6c6c266439 Merge topic 'GenerateExportHeader_MinorFix' 
54e1f6f GenerateExportHeader: use double quotes around _gcc_version
 2012-02-21 15:57:02 -05:00
David Cole
09c16ca488 Merge topic 'improve-findopenmp' 
6f573ac FindOpenMP: try the most likely flags first
81228e9 FindOpenMP: do not fail if only C or CXX is enabled (#11910)
 2012-02-21 15:56:53 -05:00
David Cole
115d770b33 Merge topic 'improve-findfreetype' 
f58cce0 FindFreetype: support version selection
 2012-02-21 15:56:35 -05:00
David Cole
751e492840 Merge topic 'fix-typos-12975' 
7ec2ebd fix the same typos as found by Debian in other places, too
d36d29f various typo and formatting fixes in manual pages (#12975)
 2012-02-21 15:56:13 -05:00
David Cole
7d4074e1f8 Merge topic 'improve-findpkgconfig' 
2750115 FindPkgConfig: support version selection of pkg-config itself
 2012-02-21 15:56:03 -05:00
David Cole
40d2da09c5 Merge topic 'improve-findlibxslt' 
70697a8 FindLibXslt: support version selection
 2012-02-21 15:55:34 -05:00
David Cole
7023f610d4 Merge topic 'improve-findruby' 
854e762 FindRuby: clean up querying variables from Ruby
 2012-02-21 15:55:26 -05:00
David Cole
d39acfa105 Merge topic 'findblas-bugs' 
4585e57 FindBLAS/FindLAPACK: Work with MKL version 10.3 (#12924, #12925)
 2012-02-21 15:55:11 -05:00
David Cole
ee9fd3d3d3 Merge topic 'FindX11_SearchXxf86vm' 
b295162 fix #6976: FindX11 also searches for X11_Xxf86vm_LIB
 2012-02-21 15:54:40 -05:00
David Cole
1b1eb9740b Merge topic 'fix_fortran_dir_two_dirs' 
087bea3 Allow two cmake_add_fortran_subdirectory calls in the same project.
 2012-02-21 15:54:29 -05:00
David Cole
e17f270b7a Merge topic 'improve-findglut' 
14dadbd FindGLUT: honor REQUIRED (#12466)
 2012-02-21 15:54:19 -05:00
David Cole
d84233a70d Merge topic 'findperllibs-windows' 
10dfec3 FindPerlLibs: properly detect libperl on Windows (#12224)
 2012-02-21 15:53:50 -05:00
David Cole
27431d2886 Merge topic 'FindGetTextFixMultipleTargets' 
3b48822 FindGetText: fix multiple targets with the same name problem (CMP0002)
 2012-02-21 15:53:31 -05:00
Alex Neundorf
35c48e1270 Check*.cmake: Expand imported targets in CMAKE_REQUIRED_LIBRARIES 
Add the function cmake_expand_imported_targets() to expand imported
targets in a list of libraries into their on-disk file names for a
particular configuration.  Adapt the implementation from KDE's
HANDLE_IMPORTED_TARGETS_IN_CMAKE_REQUIRED_LIBRARIES which has been in
use for over 2 years.  Call the function from all the Check*.cmake
macros to handle imported targets named in CMAKE_REQUIRED_LIBRARIES.

Alex
 2012-02-21 15:38:15 -05:00
Alex Neundorf
628f365140 -remove trailing whitespace 
Alex
 2012-02-21 15:33:31 -05:00
Mike McQuaid
35cbf23c95 Ensure libs are passed to BundleUtilities. 2012-02-21 17:13:59 +00:00
Mike McQuaid
0ac15353e0 Fix bad plugin paths. 2012-02-21 17:13:09 +00:00
Mike McQuaid
a2123e8f3e Fix mismatched arguments. 2012-02-21 17:12:32 +00:00
Mike McQuaid
fc6f340137 Don't use QT_LIBRARIES_PLUGINS by default. 
A lot of the libraries won't be found by default so will spit out
all sorts of errors. Don't kill QT_LIBRARIES_PLUGINS altogether as
it is sometimes useful.
 2012-02-21 17:12:32 +00:00
Clinton Stimpson
f5066217db Fix paths/hints for finding qtmain. 2012-02-20 13:02:11 -07:00
Brad King
bdbbf763d6 Recognize Embarcadero compiler (#12604) 
The Borland compiler was re-branded as CodeGear during 2007-2009 and
since 2009 is the Embarcadero compiler.  They offer predefined macros:

  http://docwiki.embarcadero.com/RADStudio/en/Predefined_Macros

and distinguish themselves by __CODEGEARC__ and __CODEGEARC_VERSION__.

Version 6.30 (C++Builder XE) changed the meaning of some flags:

  http://docwiki.embarcadero.com/RADStudio/en/C%2B%2B_Compiler_Option_Changes_for_XE

Teach Embarcadero compiler information files to generate build rules
with flags matching the compiler version.  Leave the flags unchanged
for old Borland versions.  Always set the BORLAND toolchain indicator
for compatibility with existing projects that test it.  Also set the
EMBARCADERO indicator for newer toolchains.
 2012-02-20 10:09:44 -05:00
Eric NOULARD
4da2223ab7 Fix typo in end markup 2012-02-18 23:13:45 +01:00
Eric NOULARD
cfac874b77 More documentation concerning CPack Components 2012-02-18 23:10:14 +01:00
Eric NOULARD
dee0a38648 Put CPack DMG and PackageMaker doc in separate files 2012-02-18 22:33:10 +01:00
Eric NOULARD
b4abcfecbe Correct copy/paste section name mistake 2012-02-18 22:31:43 +01:00
Eric NOULARD
7a8f44a2d6 Add structure documentation for CPack Bundle generator 2012-02-18 22:14:45 +01:00
Eric NOULARD
b8a274c091 Add structured documentation for NSIS 2012-02-18 22:10:19 +01:00
Eric NOULARD
a6bce55aef Dynamically add documentation section specified in documented script. 
Modify CPackDeb and CPackRPM as an example
 2012-02-18 22:07:39 +01:00
Alex Neundorf
54e1f6f5a5 GenerateExportHeader: use double quotes around _gcc_version 
The GenerateExportHeaders test was failing on one machine, the version
could not be determined there, so the _gcc_version was empty,
so the first argument to if() was empty, so it complained:
http://open.cdash.org/testDetails.php?test=135623436&build=2016288
Use double quotes to turn the non-existant first argument into an empty
string.

Alex
 2012-02-18 20:58:19 +01:00
Rolf Eike Beer
6f573ac9ee FindOpenMP: try the most likely flags first 
Since we know which compiler we have we can test those OpenMP flags first that
are likely to be correct. This doesn't make any difference for GNU compilers,
but it should avoid useless try_compiles and output cluttering for all others.
 2012-02-18 16:52:50 +01:00
Rolf Eike Beer
7ec2ebdbcf fix the same typos as found by Debian in other places, too 2012-02-18 16:13:34 +01:00
Modestas Vainius
d36d29f1f0 various typo and formatting fixes in manual pages (#12975) 
The patch fixes the following lintian warnings:

W: cmake-data: manpage-has-errors-from-man usr/share/man/man1/cmakemodules.1.gz 2728: warning: macro `..' not defined
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz overriden overridden
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz overriden overridden
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz explicitely explicitly
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz jave java
W: cmake-data: manpage-has-errors-from-man usr/share/man/man1/cmakeprops.1.gz 1040: warning [p 25, 3.7i]: can't break line
W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 4233: warning [p 85, 1.3i]: can't break line
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz overriden overridden
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz overriden overridden
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz explicitely explicitly
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz jave java
 2012-02-18 16:12:45 +01:00
Rolf Eike Beer
27501155c7 FindPkgConfig: support version selection of pkg-config itself 2012-02-18 11:57:38 +01:00
Peter Kuemmel
f999a59afe Ninja: don't define MSVC_IDE when using the ninja generator 
Thanks to Oscar Fuentes
 2012-02-18 11:24:41 +01:00
Brad King
3f78ced7c2 Rename Modules/Platform/Windows-{Borland => Embarcadero}.cmake 
The Borland compiler is now the Embarcadero compiler.  Rename the shared
platform information file to reflect this.  This does not change the
interface, as old versions are still "Borland", but will allow new
versions released by Embarcadero to be supported cleanly.
 2012-02-17 17:04:19 -05:00
Rolf Eike Beer
f58cce031e FindFreetype: support version selection 2012-02-17 18:31:23 +01:00