ffdb8e2b6a
Merge topic 'FindCxxTest-version-4-issue-13022'
...
a556137#13022 )
2012-03-13 11:52:54 -04:00
5d18223917
write_basic_package_version_file: add ExactVersion mode
...
This mode is for packages which consider themselves only compatible if
exactly the same version is requested. The tweak version is ignored.
Alex
2012-03-10 16:10:52 +01:00
1c69cd8feb
write_basic_package_version_file(): improve documentation
...
add notes when which mode should be used
Alex
2012-03-10 16:09:17 +01:00
4693cf8492
Xcode: Detect new default locations of Xcode 4.3 bits and pieces ( #12621 )
...
Xcode 4.3 installs into "/Applications" by default, from the Mac App Store.
Also, the paths to the available SDKs changed: they are now within the
Xcode.app bundle.
PackageMaker is installed as a separate program, and may be installed
anywhere. It is not installed with Xcode 4.3 by default anymore.
Download the "Auxiliary Tools for Xcode" to get PackageMaker.
Put PackageMaker inside the Xcode.app bundle, in its nested Applications
folder, or put it alongside Xcode in "/Applications" and CMake will find
it.
Update references to "find" paths: add new possible locations for finding
Xcode.app and PackageMaker.app. Prefer the most recent version's locations
first, but keep the old locations as fallback search paths, too.
Thanks to all the contributors who provided and tested out various patches
for fixing this issue. Especially, but by no means limited to:
Francisco Requena Espí, Jamie Kirkpatrick and drfrogsplat.
2012-03-08 22:43:19 -05:00
36ce6e01f8
Merge topic 'qt4-deploy'
...
2c601c1
2012-03-08 15:14:40 -05:00
da43d8fa8d
Merge topic 'MakingConfigFilesEasier_ConfigureMacro'
...
6973e2d204f5d4
2012-03-08 15:14:12 -05:00
9f6c38253a
Merge topic 'CPackNSIS-addMissingDoc'
...
d4719a8
2012-03-08 15:13:51 -05:00
2c601c100b
DeployQt4: Add path to Qt dlls on Windows.
2012-03-07 11:43:27 -07:00
6973e2d5a8
wrap write_basic_config_version_file as write_basic_package_version_file()
...
So the name fits better with configure_package_config_file(), as
discussed on the mailing list. Adapt the documentation accordingly.
Alex
2012-03-07 11:23:18 -05:00
204f5d443c
add CMakePackageConfigHelpers: configure_package_config_file()
...
The function configure_package_config_file() may be used instead of
configure_file() for generating the Config.cmake files for installation,
they help to make those files relocatable.
Alex
2012-03-07 11:23:11 -05:00
a556137608
FindCxxTest: Add support for CxxTest 4 ( #13022 )
...
In CxxTest version 4 the Perl generator has been deleted and the
Python generator is installed without the ".py" extension.
2012-03-07 07:59:45 -05:00
d4719a8d36
Add some missing CPACK_NSIS_xxx doc and move some to common CPack section.
2012-03-06 23:23:08 +01:00
50f9db9b00
Merge topic 'skip-install-rpath'
...
635bf50
2012-03-06 15:27:54 -05:00
5aa0f24350
Merge topic 'improve-findqt3'
...
678c24d91a16709dae4d62cd898d
2012-03-06 15:26:31 -05:00
b22f2f18c1
Merge topic 'qt4-deploy'
...
4689eedab9661c52e8279672e3bb4853e1e35cbf230ac1535a2123e8fc6f340
2012-03-06 15:25:02 -05:00
635bf50c27
Add an option to skip RPATH during installation.
2012-03-05 22:24:57 +01:00
678c24d230
FindQt3: fix detection of Qt3 include directory
...
The include directory is likely not inside ../bin
2012-03-02 18:08:37 +01:00
91a1670f47
FindQt3: let FPHSA handle the version selection
2012-03-02 18:08:37 +01:00
9dae4d65d7
FindQt3: fix version extraction for versions with letters
2012-03-02 18:08:37 +01:00
be0bb04be3
Merge topic 'document-missing-versions'
...
95f5094
2012-03-02 11:49:08 -05:00
0eb520f47c
Merge topic 'fix-FindPackageMode-symlink'
...
0b86388
2012-03-02 11:47:59 -05:00
fc495b79da
Merge topic 'findpythoninterp-version-detection'
...
7d6db93
2012-03-02 11:47:31 -05:00
b930798042
Merge topic 'fix-findimagemagick-no-components'
...
518f965
2012-03-02 11:47:11 -05:00
6c36bbd442
Merge topic 'CPack-fixPackageMaker-doc'
...
2ace342c895062
2012-03-02 11:46:40 -05:00
e95a2f8f94
Merge topic 'CPack-cygwinGeneratorDoc'
...
98d1583
2012-03-02 11:46:31 -05:00
c79a57b0ac
Merge topic 'CPack-updateCommonDoc'
...
6ad0f0494a2693
2012-03-02 11:46:23 -05:00
54225c0706
Merge topic 'CPack-fixCPackDMG-docLayout'
...
b3851f5
2012-03-02 11:46:09 -05:00
e4fb3e3212
Merge topic 'CPack-fixCPackBundleDocLayout'
...
4849e6a
2012-03-02 11:46:00 -05:00
4a97a2b913
Merge topic 'fix-findhspell-version'
...
213eb6e
2012-03-02 11:45:39 -05:00
391f4113e0
Merge topic 'improve-findopenscenegraph'
...
ffdaa47
2012-03-02 11:45:21 -05:00
ccd502ad44
Merge topic 'improve-generateexportheader'
...
c28e2764412fc0
2012-03-02 11:44:58 -05:00
d2213c5b23
Merge topic 'icc-compiler-flags'
...
f6ecb90
2012-03-02 11:44:47 -05:00
5264292a26
Merge topic 'improve-findpythonlibs'
...
53d02ea91d5a2ac9c1a17#3080 )
f772378bbddaee
2012-03-02 11:44:37 -05:00
d284bd7843
Merge topic 'cleanup-useswig'
...
aca1121
2012-03-02 11:44:26 -05:00
fe8fbc6b48
Merge topic 'simplify-findopenmp'
...
0110262
2012-03-02 11:44:15 -05:00
973eba57f9
Merge topic 'fix-generate_export_header-docs'
...
40efa4d
2012-03-02 11:44:05 -05:00
ad2de3a0c5
Merge topic 'add-Embarcadero-support'
...
bdbbf76#12604 )
3f78ced
2012-03-02 11:43:48 -05:00
2cd898d54b
FindQt3: fix warning when Qt3 is not found
...
-- Could NOT find Qt3 (missing: QT_QT_LIBRARY QT_INCLUDE_DIR QT_MOC_EXECUTABLE)
CreateProcess failed QT_MOC_EXECUTABLE-NOTFOUND -v
CreateProcess failed QT_UIC_EXECUTABLE-NOTFOUND -version
2012-03-02 17:02:03 +01:00
95f50940cc
document when version detection will not work
2012-02-29 18:46:47 +01:00
0b8638821e
CMakeFindPackageMode: fix 32/64bit detection if 'file' is a symlink
2012-02-28 12:59:01 -05:00
7d6db93de9
FindPythonInterp: rework the version detection
...
There are versions out there that neither understand --version nor -V. Try a
completely different approach: execute a small python script that prints the
version number (and only that) in an easily reusable way using
sys.version_info. This is documented to work since Python 2.0. Use sys.version
for older versions, which is documented to exist since 1.5. If even that
doesn't work then simply assume we are on 1.4.0.
2012-02-27 18:15:01 +01:00
518f965bba
FindImageMagick: fix fail if no components were given
...
The variable name should be added to the list here, not the content.
2012-02-27 17:25:24 +01:00
2ace3427ac
Typo: Add missing ##end for ##module
2012-02-25 23:28:31 +01:00
98d158376e
Provide template for CPack Cygwin generator specific variables.
2012-02-25 23:26:41 +01:00
c895062180
Update CPack PackageMaker variable doc layout
2012-02-25 23:14:47 +01:00
94a269304e
Review and update CPack variable documentation.
...
This concerns all variables common to all CPack generators.
Variables mainly used and/or set in CPack.cmake are documented
therein. C++ built-in variables are documented in
cmCPackDocumentVariables.cxx.
2012-02-25 23:07:07 +01:00
b3851f504d
Fix CPack Drag and Drop generator documentation layout.
2012-02-25 19:18:52 +01:00
4849e6ac63
Fix layout of the CPack Bundle documentation
...
CPACK_BUNDLE_STARTUP_SCRIPT was in fact CPACK_BUNDLE_STARTUP_COMMAND in
the C++ code. The doc has been changed accordingly.
2012-02-25 19:05:08 +01:00
213eb6e6a6
FindHSPELL: set HSPELL_VERSION_STRING
...
This variable was documented, but never set.
2012-02-25 14:52:19 +01:00
ffdaa4761c
FindOpenSceneGraph: give every message() with an explicit level
2012-02-24 20:39:01 +01:00
c28e276948
GenerateExportHeader: improve compiler identification
...
Use CMAKE_<LANG>_COMPILER_VERSION instead of calling the compiler. This macro
predates those useful variables. This also fixes the issue that g++ version
detection was not working if C language was not enabled.
2012-02-24 17:48:02 +01:00
4412fc0890
GenerateExportHeader: remove unneeded code
...
These expressions check for command line arguments unsupported by the compiler.
We don't pass any custom flags here anyway so this isn't needed.
2012-02-24 17:13:22 +01:00
f6ecb900fb
Check{C,CXX}CompilerFlag: detect ICC error messages
...
Patch provided by Christopher Sean Morrison.
2012-02-23 23:08:04 +01:00
4853e1effd
Fix plugin installation issues.
2012-02-23 21:01:45 +00:00
53d02ea1ea
FindPythonLibs: stop scanning when libraries are found
2012-02-23 18:49:06 +01:00
91d5a2a386
FindPythonLibs: put debug libraries into PYTHON_LIBRARIES
2012-02-23 18:48:24 +01:00
aca1121ea6
UseSWIG: clean up string compares
2012-02-23 18:39:23 +01:00
bada88e8e4
Merge branch 'target-include-directories' into ninja-generator
2012-02-22 16:21:48 -05:00
0110262a2d
FindOpenMP: simplify check for enabled languages
2012-02-22 17:47:52 +01:00
c9c1a17609
FindPythonLibs: get the exact version of the found library ( #3080 )
2012-02-22 17:20:15 +01:00
f7723786e7
FindPythonLibs: make the version selection work as for PythonInterp
2012-02-22 17:20:15 +01:00
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
40efa4db74
Fix documented function signature to match reality.
...
The function description is already correct.
2012-02-21 23:54:01 +01:00
8ef15df700
Merge topic 'HandleTargetsInCMakeRequiredLibraries'
...
35c48e161cb4eac9f2886628f365
2012-02-21 15:58:27 -05:00
bf6560091d
Merge topic 'qt3-find-qtmain'
...
f506621
2012-02-21 15:58:06 -05:00
7d02020d68
Merge topic 'CPack-dynamicDocSection'
...
9a8103e4da2223cfac874dee0a38b4abcfe97177277a8f44ab8a274ca6bce55
2012-02-21 15:57:17 -05:00
6c6c266439
Merge topic 'GenerateExportHeader_MinorFix'
...
54e1f6f
2012-02-21 15:57:02 -05:00
09c16ca488
Merge topic 'improve-findopenmp'
...
6f573ac81228e9#11910 )
2012-02-21 15:56:53 -05:00
115d770b33
Merge topic 'improve-findfreetype'
...
f58cce0
2012-02-21 15:56:35 -05:00
751e492840
Merge topic 'fix-typos-12975'
...
7ec2ebdd36d29f#12975 )
2012-02-21 15:56:13 -05:00
7d4074e1f8
Merge topic 'improve-findpkgconfig'
...
2750115
2012-02-21 15:56:03 -05:00
40d2da09c5
Merge topic 'improve-findlibxslt'
...
70697a8
2012-02-21 15:55:34 -05:00
7023f610d4
Merge topic 'improve-findruby'
...
854e762
2012-02-21 15:55:26 -05:00
d39acfa105
Merge topic 'findblas-bugs'
...
4585e57#12924 , #12925 )
2012-02-21 15:55:11 -05:00
ee9fd3d3d3
Merge topic 'FindX11_SearchXxf86vm'
...
b295162fix #6976 : FindX11 also searches for X11_Xxf86vm_LIB
2012-02-21 15:54:40 -05:00
1b1eb9740b
Merge topic 'fix_fortran_dir_two_dirs'
...
087bea3
2012-02-21 15:54:29 -05:00
e17f270b7a
Merge topic 'improve-findglut'
...
14dadbd#12466 )
2012-02-21 15:54:19 -05:00
d84233a70d
Merge topic 'findperllibs-windows'
...
10dfec3#12224 )
2012-02-21 15:53:50 -05:00
27431d2886
Merge topic 'FindGetTextFixMultipleTargets'
...
3b48822
2012-02-21 15:53:31 -05:00
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
628f365140
-remove trailing whitespace
...
Alex
2012-02-21 15:33:31 -05:00
35cbf23c95
Ensure libs are passed to BundleUtilities.
2012-02-21 17:13:59 +00:00
0ac15353e0
Fix bad plugin paths.
2012-02-21 17:13:09 +00:00
a2123e8f3e
Fix mismatched arguments.
2012-02-21 17:12:32 +00:00
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
f5066217db
Fix paths/hints for finding qtmain.
2012-02-20 13:02:11 -07:00
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
4da2223ab7
Fix typo in end markup
2012-02-18 23:13:45 +01:00
cfac874b77
More documentation concerning CPack Components
2012-02-18 23:10:14 +01:00
dee0a38648
Put CPack DMG and PackageMaker doc in separate files
2012-02-18 22:33:10 +01:00
b4abcfecbe
Correct copy/paste section name mistake
2012-02-18 22:31:43 +01:00
7a8f44a2d6
Add structure documentation for CPack Bundle generator
2012-02-18 22:14:45 +01:00
b8a274c091
Add structured documentation for NSIS
2012-02-18 22:10:19 +01:00
a6bce55aef
Dynamically add documentation section specified in documented script.
...
Modify CPackDeb and CPackRPM as an example
2012-02-18 22:07:39 +01:00
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
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
7ec2ebdbcf
fix the same typos as found by Debian in other places, too
2012-02-18 16:13:34 +01:00
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
27501155c7
FindPkgConfig: support version selection of pkg-config itself
2012-02-18 11:57:38 +01:00
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
Alex Neundorf
David Cole
Clinton Stimpson
Droscy
Eric NOULARD
Stephen Kelly
Rolf Eike Beer
Yury G. Kudryashov
Mike McQuaid
Modestas Vainius
Peter Kuemmel