David Cole
5576655f36
Merge topic 'fix-12490-shorten-gcov-filenames'
...
2f309cb
CTest: Add COVERAGE_EXTRA_FLAGS cache variable (#12490 )
2011-10-25 15:34:16 -04:00
David Cole
e1902dd145
Merge topic 'qt4-deploy-module'
...
0618045
Add DeployQt4 module.
cf4b529
Add QT_LIBRARIES_PLUGINS variable to UseQt4.
2011-10-25 15:33:56 -04:00
David Cole
2f309cba45
CTest: Add COVERAGE_EXTRA_FLAGS cache variable ( #12490 )
...
COVERAGE_EXTRA_FLAGS is a space separated value of extra flags
that will be passed to gcov when ctest's coverage handler invokes
gcov to do coverage analysis.
Map to CoverageExtraFlags in the CTest ini file. Use default value
of "-l" to match the coverage handler's earlier behavior from ctest
2.8.4 and earlier. The fix for related issue #11717 had added a " -p"
which was the cause of both #12415 and #12490 . Here, we revert that
change to the default value, so -p is no longer there by default.
The people that care to add -p may do so in their own build trees
by appending " -p" to the new cache variable COVERAGE_EXTRA_FLAGS.
2011-10-22 11:01:58 -04:00
David Cole
049d2bc77d
Merge topic 'DetectEclipseVersion'
...
dcd2459
Eclipse: better message when Eclipse version could not be determined
b4b2fc3
Eclipse: don't create VirtualFolders if not supported
5b200e3
Detect whether the current Eclipse version supports VirtualFolders
4974ec9
Eclipse generator: detect Eclipse version
2011-10-18 15:04:22 -04:00
David Cole
c818589113
Merge topic 'FindProtoBuf_doc_clarify'
...
a481d84
FindProtoBuf: Documented limitation of the public macro
2011-10-18 15:03:43 -04:00
David Cole
02e99d9851
Merge topic 'FindRubyOnOpenBSD'
...
d2b1ce6
Find Ruby on OpenBSD when installed from ports (#12507 )
ba5a8bc
Remove trailing whitespace
2011-10-18 15:02:53 -04:00
David Cole
91e970ce5b
Merge topic 'DetectMasmCompilerId'
...
cf93d63
fix #12465 : detect the masm compiler ID ("MSVC")
2011-10-18 15:02:30 -04:00
Alex Neundorf
dcd245913c
Eclipse: better message when Eclipse version could not be determined
...
Alex
2011-10-15 21:04:23 +02:00
Alex Neundorf
4974ec90a4
Eclipse generator: detect Eclipse version
...
Try to detect the eclipse version and put it in the cache.
Alex
2011-10-15 18:43:27 +02:00
Philip Lowman
a481d84ff7
FindProtoBuf: Documented limitation of the public macro
2011-10-12 23:44:40 -04:00
Alex Neundorf
d2b1ce6af0
Find Ruby on OpenBSD when installed from ports ( #12507 )
...
The ruby library on OpenBSD is named rubyXY, not ruby X.y.
Find that too.
Alex
2011-10-12 23:05:52 +02:00
Alex Neundorf
ba5a8bcf5d
Remove trailing whitespace
...
Alex
2011-10-12 23:05:30 +02:00
David Cole
3ece15b8f9
Merge topic 'HandleCMAKE_CXX_COMPILER_ARG1InEclipse'
...
3df49dc
fix #12392 : handle CMAKE_CXX_COMPILER_ARG1 for Eclipse projects
2011-10-11 14:45:09 -04:00
David Cole
bb28c9f3bf
Merge topic 'qt_dbus_interface_args'
...
648c454
Add features from KDE for arguments to qdbusxml2cpp.
2011-10-11 14:44:48 -04:00
Alex Neundorf
cf93d63c0a
fix #12465 : detect the masm compiler ID ("MSVC")
...
Alex
2011-10-06 17:57:32 +02:00
Mike McQuaid
06180459cc
Add DeployQt4 module.
...
Add a module that gives better support to BundleUtilities to handle
Qt plugins and deploy Qt applications.
2011-10-03 11:01:48 -06:00
Mike McQuaid
cf4b52980d
Add QT_LIBRARIES_PLUGINS variable to UseQt4.
2011-10-03 11:01:39 -06:00
Alex Neundorf
3df49dc7b1
fix #12392 : handle CMAKE_CXX_COMPILER_ARG1 for Eclipse projects
...
CMAKE_CXX/C_COMPILER_ARG1 have to be used for finding the include
dirs and builtin macros, so Eclipse can do code completion
Alex
2011-10-01 19:09:24 +02:00
David Cole
c4ef30e3dd
Merge topic 'PkgConfigTypoFix'
...
9cbbea3
Fix typo in UsePkgConfig.cmake
2011-09-30 15:57:24 -04:00
David Cole
449aef3efb
Merge topic 'vs11-generator'
...
3b5256e
Teach our tests about special cases for VS 11
3d5632e
Add Visual Studio 11 generator for x86 and x64 tools
2011-09-30 15:57:17 -04:00
Rolf Eike Beer
9cbbea31d3
Fix typo in UsePkgConfig.cmake
2011-09-29 19:43:44 +02:00
Brad King
89bdc3e213
Merge topic 'FindBulletLibRenames'
...
6f935d7
FindBullet: Also search for _Debug postfixed library names
2011-09-26 11:24:46 -04:00
Brad King
3d5632ed59
Add Visual Studio 11 generator for x86 and x64 tools
2011-09-23 10:10:01 -04:00
Philip Lowman
6f935d7f55
FindBullet: Also search for _Debug postfixed library names
2011-09-22 23:31:37 -04:00
Alex Neundorf
59ccf38554
Minor improvements to the UsePkgConfig.cmake docs
...
Alex
2011-09-22 14:47:18 +02:00
Alex Neundorf
ad11118ebf
Remove trailing whitespace
...
Alex
2011-09-22 14:39:19 +02:00
David Cole
26e5b0ea82
Merge topic 'revert-fix-for-11333'
...
98c49a4
Revert "FindThreads: Try pthreads with no special option first (#11333 )"
2011-09-21 17:29:39 -04:00
David Cole
ac623ce2fe
Merge topic 'CPackRPM-per-component-script'
...
cc26a06
CPackRPM authorize per-component pre/post-[un]install scripts (#0012063 )
2011-09-21 17:29:30 -04:00
David Cole
253e370c9e
Merge topic 'generate-export-header'
...
41e2b1d
Make add_compiler_export_flags a function again.
6a10deb
Made ADD_COMPILER_EXPORT_FLAGS into a macro.
2d1acfe
Don't warn when nothing to do in visibility function.
d679568
Just code style changes.
2011-09-21 17:29:23 -04:00
David Cole
682a989fdb
Merge topic 'CPackDeb-fakeroot'
...
49da3bd
CPackDeb fix #10325 automagically use fakeroot for DEB if fakeroot is found
2011-09-21 17:29:16 -04:00
David Cole
98c49a4a25
Revert "FindThreads: Try pthreads with no special option first ( #11333 )"
...
This reverts commit fd61be7140
.
2011-09-20 18:40:22 -04:00
David Cole
d622088b2b
Merge topic 'MinorFeatureSummaryFixes'
...
0ba9853
Don't warn when setting a property multiple times to the same value #12464
b7ac63e
Fix typos in FeatureSummary.cmake (#12462 )
2011-09-20 14:42:21 -04:00
David Cole
f628f12799
Merge topic 'CheckForFlexHeader'
...
ae331e1
FindFLEX.cmake: also search the include dir
2011-09-20 14:42:16 -04:00
David Cole
bef996852e
Merge topic 'FortranCInterface-VS'
...
67fcc83
Simplify IntelVSImplicitPath detection project
a7ce26d
Move IntelVSImplicitPath project to better location
539a822
Enable Fortran tests for IDE builds.
555f589
For VS Intel Fortran IDE builds, add a check to find the Fortran library PATH.
71402eb
FortranCInterface: Compile separate Fortran lib in VerifyC[XX]
2011-09-20 14:41:56 -04:00
Eric NOULARD
cc26a0614a
CPackRPM authorize per-component pre/post-[un]install scripts ( #0012063 )
...
Merged patch from Chip Christian previously based on the one from winfriedd
with some small pruning editing by commiter
2011-09-20 20:21:01 +02:00
Marcus D. Hanwell
41e2b1d824
Make add_compiler_export_flags a function again.
...
Making this a macro had unintended issues on (among others) Windows
compilers. Moving it back to being a function using PARENT_SCOPE still
satisfies the use case where we simply want to obtain the extra flags.
2011-09-20 00:16:16 -04:00
Marcus D. Hanwell
6a10deb670
Made ADD_COMPILER_EXPORT_FLAGS into a macro.
...
It adds to the CMAKE_CXX_FLAGS (as before), or populates the supplied
optional argument with the CXX_FLAGS for symbol import/export.
2011-09-19 16:42:42 -04:00
Marcus D. Hanwell
2d1acfe359
Don't warn when nothing to do in visibility function.
2011-09-19 14:55:19 -04:00
Marcus D. Hanwell
d6795685ae
Just code style changes.
2011-09-19 14:04:42 -04:00
Alex Neundorf
0ba98533d0
Don't warn when setting a property multiple times to the same value #12464
...
Patch by Yury Kudryashov
Alex
2011-09-18 12:51:05 +02:00
Alex Neundorf
b7ac63e1c1
Fix typos in FeatureSummary.cmake ( #12462 )
...
Patch by Yury Kudrashov
Alex
2011-09-18 12:46:29 +02:00
Alex Neundorf
ae331e1864
FindFLEX.cmake: also search the include dir
...
FindFLEX.cmake already searched for the library, but
not for the include dir. Do that too.
Alex
2011-09-17 14:27:24 +02:00
Brad King
67fcc838d9
Simplify IntelVSImplicitPath detection project
...
Use the ENV{LIB} variable directly instead of parsing the output of the
whole environment from "set". Store the output in a .cmake script and
include it from CMakeDetermineCompilerABI instead of using file(READ).
2011-09-14 14:06:02 -04:00
Brad King
a7ce26d837
Move IntelVSImplicitPath project to better location
...
This project is not part of the FortranCInterface module. Make it a
sibling instead of a child directory.
2011-09-14 13:49:40 -04:00
David Cole
21e03c4c44
Merge topic 'CPackDeb-remove-stray-paren'
...
85fd794
remove stray brace in CPackDeb documentation
2011-09-13 14:33:12 -04:00
Rolf Eike Beer
85fd794a19
remove stray brace in CPackDeb documentation
2011-09-12 11:47:31 -04:00
Bill Hoffman
555f589a5a
For VS Intel Fortran IDE builds, add a check to find the Fortran library PATH.
...
To use VS C and Fotran in the same solution, it is required that VS be
able to find the Fortran run time libraries as they will be implicitly
linked by any Fortran library used by VS C programs. This adds a check
into CMakeDetermineCompilerABI using a try-compile to find the correct
PATH.
2011-09-08 17:42:49 -04:00
Eric NOULARD
59204e1126
CPack fix #12449 doc mispelled
...
CPACK_INSTALL_DIRECTORIES-->CPACK_INSTALLED_DIRECTORIESœ
2011-09-08 22:00:34 +02:00
Brad King
71402eb252
FortranCInterface: Compile separate Fortran lib in VerifyC[XX]
...
The Intel Fortran plugin for Visual Studio requires Fortran source files
to be compiled in a separate target from C and C++ code. Compile the
VerifyFortran.f source file in a separate library and link the main
VerifyFortanC executable to it.
2011-09-08 14:56:48 -04:00
David Cole
c80cbad152
Merge topic 'CPackRPM-includeDir'
...
f9e5277
CPackRPM fix #12305 , include directories in RPM package
2011-09-07 15:38:50 -04:00