Brad King
ffdb8e2b6a
Merge topic 'FindCxxTest-version-4-issue-13022'
...
a556137
FindCxxTest: Add support for CxxTest 4 (#13022 )
2012-03-13 11:52:54 -04:00
David Cole
36ce6e01f8
Merge topic 'qt4-deploy'
...
2c601c1
DeployQt4: Add path to Qt dlls on Windows.
2012-03-08 15:14:40 -05:00
David Cole
da43d8fa8d
Merge topic 'MakingConfigFilesEasier_ConfigureMacro'
...
6973e2d
wrap write_basic_config_version_file as write_basic_package_version_file()
204f5d4
add CMakePackageConfigHelpers: configure_package_config_file()
2012-03-08 15:14:12 -05:00
David Cole
9f6c38253a
Merge topic 'CPackNSIS-addMissingDoc'
...
d4719a8
Add some missing CPACK_NSIS_xxx doc and move some to common CPack section.
2012-03-08 15:13:51 -05:00
Clinton Stimpson
2c601c100b
DeployQt4: Add path to Qt dlls on Windows.
2012-03-07 11:43:27 -07:00
Alex Neundorf
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
Alex Neundorf
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
Droscy
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
Eric NOULARD
d4719a8d36
Add some missing CPACK_NSIS_xxx doc and move some to common CPack section.
2012-03-06 23:23:08 +01:00
David Cole
50f9db9b00
Merge topic 'skip-install-rpath'
...
635bf50
Add an option to skip RPATH during installation.
2012-03-06 15:27:54 -05:00
David Cole
5aa0f24350
Merge topic 'improve-findqt3'
...
678c24d
FindQt3: fix detection of Qt3 include directory
91a1670
FindQt3: let FPHSA handle the version selection
9dae4d6
FindQt3: fix version extraction for versions with letters
2cd898d
FindQt3: fix warning when Qt3 is not found
2012-03-06 15:26:31 -05:00
David Cole
b22f2f18c1
Merge topic 'qt4-deploy'
...
4689eed
reflect that the QtAutomoc depends on QtGui
ab9661c
Remove QtGui dependency in Qt4Deploy test and verify QtSql existance.
52e8279
Fix for Qt4Deploy on some test machines.
672e3bb
Add test for DeployQt4.cmake
4853e1e
Fix plugin installation issues.
35cbf23
Ensure libs are passed to BundleUtilities.
0ac1535
Fix bad plugin paths.
a2123e8
Fix mismatched arguments.
fc6f340
Don't use QT_LIBRARIES_PLUGINS by default.
2012-03-06 15:25:02 -05:00
Stephen Kelly
635bf50c27
Add an option to skip RPATH during installation.
2012-03-05 22:24:57 +01:00
Rolf Eike Beer
678c24d230
FindQt3: fix detection of Qt3 include directory
...
The include directory is likely not inside ../bin
2012-03-02 18:08:37 +01:00
Rolf Eike Beer
91a1670f47
FindQt3: let FPHSA handle the version selection
2012-03-02 18:08:37 +01:00
Rolf Eike Beer
9dae4d65d7
FindQt3: fix version extraction for versions with letters
2012-03-02 18:08:37 +01:00
David Cole
be0bb04be3
Merge topic 'document-missing-versions'
...
95f5094
document when version detection will not work
2012-03-02 11:49:08 -05:00
David Cole
0eb520f47c
Merge topic 'fix-FindPackageMode-symlink'
...
0b86388
CMakeFindPackageMode: fix 32/64bit detection if 'file' is a symlink
2012-03-02 11:47:59 -05:00
David Cole
fc495b79da
Merge topic 'findpythoninterp-version-detection'
...
7d6db93
FindPythonInterp: rework the version detection
2012-03-02 11:47:31 -05:00
David Cole
b930798042
Merge topic 'fix-findimagemagick-no-components'
...
518f965
FindImageMagick: fix fail if no components were given
2012-03-02 11:47:11 -05:00
David Cole
6c36bbd442
Merge topic 'CPack-fixPackageMaker-doc'
...
2ace342
Typo: Add missing ##end for ##module
c895062
Update CPack PackageMaker variable doc layout
2012-03-02 11:46:40 -05:00
David Cole
e95a2f8f94
Merge topic 'CPack-cygwinGeneratorDoc'
...
98d1583
Provide template for CPack Cygwin generator specific variables.
2012-03-02 11:46:31 -05:00
David Cole
c79a57b0ac
Merge topic 'CPack-updateCommonDoc'
...
6ad0f04
Update CPackConfig template.
94a2693
Review and update CPack variable documentation.
2012-03-02 11:46:23 -05:00
David Cole
54225c0706
Merge topic 'CPack-fixCPackDMG-docLayout'
...
b3851f5
Fix CPack Drag and Drop generator documentation layout.
2012-03-02 11:46:09 -05:00
David Cole
e4fb3e3212
Merge topic 'CPack-fixCPackBundleDocLayout'
...
4849e6a
Fix layout of the CPack Bundle documentation
2012-03-02 11:46:00 -05:00
David Cole
4a97a2b913
Merge topic 'fix-findhspell-version'
...
213eb6e
FindHSPELL: set HSPELL_VERSION_STRING
2012-03-02 11:45:39 -05:00
David Cole
391f4113e0
Merge topic 'improve-findopenscenegraph'
...
ffdaa47
FindOpenSceneGraph: give every message() with an explicit level
2012-03-02 11:45:21 -05:00
David Cole
ccd502ad44
Merge topic 'improve-generateexportheader'
...
c28e276
GenerateExportHeader: improve compiler identification
4412fc0
GenerateExportHeader: remove unneeded code
2012-03-02 11:44:58 -05:00
David Cole
d2213c5b23
Merge topic 'icc-compiler-flags'
...
f6ecb90
Check{C,CXX}CompilerFlag: detect ICC error messages
2012-03-02 11:44:47 -05:00
David Cole
5264292a26
Merge topic 'improve-findpythonlibs'
...
53d02ea
FindPythonLibs: stop scanning when libraries are found
91d5a2a
FindPythonLibs: put debug libraries into PYTHON_LIBRARIES
c9c1a17
FindPythonLibs: get the exact version of the found library (#3080 )
f772378
FindPythonLibs: make the version selection work as for PythonInterp
bbddaee
FindPython{Interp,Libs}: document Python_ADDITIONAL_VERSIONS as input
2012-03-02 11:44:37 -05:00
David Cole
d284bd7843
Merge topic 'cleanup-useswig'
...
aca1121
UseSWIG: clean up string compares
2012-03-02 11:44:26 -05:00
David Cole
fe8fbc6b48
Merge topic 'simplify-findopenmp'
...
0110262
FindOpenMP: simplify check for enabled languages
2012-03-02 11:44:15 -05:00
David Cole
973eba57f9
Merge topic 'fix-generate_export_header-docs'
...
40efa4d
Fix documented function signature to match reality.
2012-03-02 11:44:05 -05:00
David Cole
ad2de3a0c5
Merge topic 'add-Embarcadero-support'
...
bdbbf76
Recognize Embarcadero compiler (#12604 )
3f78ced
Rename Modules/Platform/Windows-{Borland => Embarcadero}.cmake
2012-03-02 11:43:48 -05:00
Rolf Eike Beer
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
Rolf Eike Beer
95f50940cc
document when version detection will not work
2012-02-29 18:46:47 +01:00
Yury G. Kudryashov
0b8638821e
CMakeFindPackageMode: fix 32/64bit detection if 'file' is a symlink
2012-02-28 12:59:01 -05:00
Rolf Eike Beer
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
Rolf Eike Beer
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
Eric NOULARD
2ace3427ac
Typo: Add missing ##end for ##module
2012-02-25 23:28:31 +01:00
Eric NOULARD
98d158376e
Provide template for CPack Cygwin generator specific variables.
2012-02-25 23:26:41 +01:00
Eric NOULARD
c895062180
Update CPack PackageMaker variable doc layout
2012-02-25 23:14:47 +01:00
Eric NOULARD
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
Eric NOULARD
b3851f504d
Fix CPack Drag and Drop generator documentation layout.
2012-02-25 19:18:52 +01:00
Eric NOULARD
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
Rolf Eike Beer
213eb6e6a6
FindHSPELL: set HSPELL_VERSION_STRING
...
This variable was documented, but never set.
2012-02-25 14:52:19 +01:00
Rolf Eike Beer
ffdaa4761c
FindOpenSceneGraph: give every message() with an explicit level
2012-02-24 20:39:01 +01:00
Rolf Eike Beer
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
Rolf Eike Beer
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
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