David Cole
0a9b51b6bc
Merge topic 'more-compiler-versions'
...
e9bc502
Detect Analog VisualDSP++ compiler version with its id
cca386b
Detect Cray compiler version with its id
622d9a7
Detect SDCC compiler version with its id
4ad7fa6
Detect Comeau compiler version with its id
952651c
Detect TI compiler version with its id
74c57d9
Detect PathScale compiler version with its id
707aefd
Detect Compaq compiler version with its id
2012-08-24 14:25:21 -04:00
David Cole
286f7c9644
Merge topic 'topics/FindCUDA/Add-CUDA_SOURCE_PROPERTY_FORMAT'
...
787287c
Added CUDA_SOURCE_PROPERTY_FORMAT. Allows setting per file format (OBJ or PTX)
2012-08-24 14:24:11 -04:00
David Cole
6dab13c56e
Merge topic 'topics/FindCUDA/Fix-g3-again'
...
a20c41d
Replace -g3 with -g for CUDA 4.1 and 4.2 in addition to CUDA < 3.0.
2012-08-24 14:23:21 -04:00
Brad King
ca9c287d1a
Merge topic 'Qt4Macros-fix-resource-parsing'
...
3553001
Qt4Macros: Fix recently broken resource file parsing
2012-08-23 10:16:58 -04:00
Brad King
e9bc502fb8
Detect Analog VisualDSP++ compiler version with its id
...
Decode hex digits from __VISUALDSPVERSION__ to compute the version
number components. Note that the constant encodes decimal digits as hex
digits (never larger than 9). We represent them as decimal after
extraction. See documentation at:
http://download.analog.com/dsp/tools/VisualDSP_45_Update_6_Release_Note_v4.pdf
http://www.analog.com/static/imported-files/software_manuals/50_asm_man.rev3.1.pdf
Note that __VISUALDSPVERSION__ was introduced in version 4.5.6.
2012-08-22 11:48:07 -04:00
Brad King
cca386b0a0
Detect Cray compiler version with its id
...
Decode decimal digits from
_RELEASE
_RELEASE_MINOR
to compute version number components. See documentation at:
http://docs.cray.com/books/S-2179-52/html-S-2179-52/zfixed5fvzxnxo.html
http://sourceforge.net/p/predef/wiki/Compilers/#cray-c
2012-08-22 11:31:33 -04:00
Brad King
622d9a789d
Detect SDCC compiler version with its id
...
Decode decimal digits from SDCC to compute version number components.
See documentation at:
http://sdcc.sourceforge.net/doc/sdccman.pdf
http://sourceforge.net/p/predef/wiki/Compilers/#small-device-c-compilerhttpenwikipediaorgwikismall_device_c_compiler
2012-08-22 10:27:09 -04:00
Brad King
4ad7fa6488
Detect Comeau compiler version with its id
...
Decode decimal digits from __COMO_VERSION__ to compute the version
number components. See documentation at:
http://www.comeaucomputing.com/4.0/docs/userman/predefs.html
http://sourceforge.net/p/predef/wiki/Compilers/#comeau-chttpenwikipediaorgwikicomeau_cc2b2b
2012-08-22 10:17:01 -04:00
Brad King
952651c642
Detect TI compiler version with its id
...
Decode decimal digits from __TI_COMPILER_VERSION__ to compute version
number components. See documentation at:
http://processors.wiki.ti.com/index.php/Refer_to_Compiler_Version_in_Your_Source
http://www.ti.com/general/docs/lit/getliterature.tsp?literatureNumber=spru187o
http://sourceforge.net/p/predef/wiki/Compilers/#texas-instruments-cc-compiler
2012-08-22 10:17:01 -04:00
Brad King
74c57d99b4
Detect PathScale compiler version with its id
...
Decode decimal digits from
__PATHCC__
__PATHCC_MINOR__
__PATHCC_PATCHLEVEL__
to compute version number components. See documentation at:
http://www.pathscale.com/docs/UserGuide.pdf
http://sourceforge.net/p/predef/wiki/Compilers/#ekopathhttpenwikipediaorgwikipathscale
2012-08-22 10:17:01 -04:00
Brad King
707aefd853
Detect Compaq compiler version with its id
...
Decode decimal digits from __DECC_VER and __DECCXX_VER to compute
version number components. See documentation at:
http://www.openvms.compaq.com/commercial/c/docs/5492p024.html#decc_ver_sec
http://www.tru64unix.compaq.com/cplus/ugu_impl.html#predef_vernum
http://sourceforge.net/p/predef/wiki/Compilers/#compaq-cchttpwwwopenvmscompaqcomopenvmsbrochuresdeccplus
2012-08-22 10:17:01 -04:00
Brad King
3553001bcc
Qt4Macros: Fix recently broken resource file parsing
...
Commit 4be67837
(read less from version headers into variables,
2012-08-19) switched from file(READ) and string(REGEX MATCHALL) to just
file(STRINGS) to extract the list of resource <file> entries. However,
the latter extracts entire lines that match the regex, not just the part
that matches the regex, so the subsequent string(REGEX REPLACE) fails to
match and replace anything. Return to the original parsing logic but
replace file(READ) with file(STRINGS) to load a minimal part of the file
before using string(REGEX MATCHALL) as before.
2012-08-22 08:37:27 -04:00
James Bigler
787287cc46
Added CUDA_SOURCE_PROPERTY_FORMAT. Allows setting per file format (OBJ or PTX)
...
Added CUDA_SOURCE_PROPERTY_FORMAT that allows users to set the format (OBJ or PTX) on a
per file basis.
2012-08-20 17:33:35 -06:00
David Cole
32710211ad
Merge topic 'qt4_use_modules'
...
1420691
Add new qt4_use_modules function.
2012-08-20 15:42:43 -04:00
David Cole
c79dd4d951
Merge topic 'read-less-from-version-headers'
...
4be6783
read less from version headers into variables
2012-08-20 15:42:34 -04:00
David Cole
19e210af90
Merge topic 'no-regex-escape-space'
...
637207e
do not escape spaces in regular expressions
2012-08-20 15:42:25 -04:00
David Cole
0afaedfb4a
Merge topic 'FindGTK2_12306'
...
ad30210
FindGTK2: Add GTK2_CAIROMMCONFIG_INCLUDE_DIR for cairommconfig.h
2012-08-20 15:42:13 -04:00
David Cole
e19f260712
Merge topic 'FindOpenSceneGraph_13094'
...
dd60ed2
Merge topic 'lib64-cleanup' into FindOpenSceneGraph_13094
224b5de
FindOpenSceneGraph: CMake variable OSG_DIR influences detection now too
2012-08-20 15:42:03 -04:00
David Cole
9a4b4f2223
Merge topic 'lib64-cleanup'
...
cfe4ac4
use PATH_SUFFIXES to simplify find_* calls
b04650e
use the find_* functions ENV parameter
2012-08-20 15:41:53 -04:00
David Cole
4097914bbd
Merge topic 'fix-13236-mark-vars-as-advanced'
...
3f9fa5c
ProcessorCount: Mark find_program vars as advanced (#13236 )
2012-08-20 15:41:44 -04:00
David Cole
ba9fde6503
Merge topic 'fix-13315-incorrect-mfc-file-name'
...
e4e6ea0
InstallRequiredSystemLibraries: Use correct file names (#13315 )
2012-08-20 15:41:26 -04:00
David Cole
e04245e2d5
Merge topic 'HandleMacFrameworkIncludeDirs_13465'
...
a3815e6
-fix line length
9110d0e
Eclipse on OSX: improve handling of framework include dirs (#13367 )
d97b385
Eclipse on OSX: fix handling of framework include dirs (#13464 )
2012-08-20 15:41:14 -04:00
David Cole
1239b4881d
Merge topic 'qt4-path-search'
...
35c6ae8
FindQt4: Give precedence to QTDIR environment variable, if set.
5a6a3d4
FindQt4: Give precedence to QTDIR environment variable, if set.
2012-08-20 15:40:36 -04:00
David Cole
321bbed130
Merge topic 'qt4-version-regex'
...
4a772a1
Fix regex for qt minor version.
2012-08-20 15:40:28 -04:00
David Cole
e11e719796
Merge topic 'hg-modules'
...
91053cd
ExternalProject: Add Mercurial (hg) repository support
ea5bfb1
Add FindHg module to find Mercurial
2012-08-20 15:40:19 -04:00
David Cole
eb6b8c86bf
Merge topic 'relwithdebinfo-consistency'
...
0ddfc51
Add -DNDEBUG to RelWithDebInfo flags where where Release flags had it.
2012-08-20 15:40:11 -04:00
David Cole
0075e7e033
Merge topic 'deployqt4-destdir'
...
1e3248c
DeployQt4: Include DESTDIR for some cpack generators.
2012-08-20 15:40:03 -04:00
David Cole
c2022eb06d
Merge topic 'fphsa-message'
...
213a9e5
fphsa: clarify message about minimum required version found.
2012-08-20 15:39:53 -04:00
David Cole
14c8096ba8
Merge topic 'more-endif-closing-style-cleanups'
...
84b49be
Remove CMake multiline block-end command arguments
2012-08-20 15:39:26 -04:00
David Cole
d4be75be12
Merge topic 'FindX11-duplicate-includes-13316'
...
dd784dd
FindX11: avoid calling list(REMOVE_DUPLICATES) on an empty list
97c338b
FindX11: remove duplicates from X11 include path list (#13316 )
2012-08-20 15:39:18 -04:00
David Cole
2582994e57
Merge topic 'clang-asm'
...
7e8471c
Recognize Clang ASM support (#13473 )
2012-08-20 15:38:51 -04:00
David Cole
5cf828c028
Merge topic 'CheckTypeSize-doc-10579'
...
c6fed68
CheckTypeSize: add a test for size of struct members
48783b7
CheckTypeSize: show in documentation how to get struct member size (#10579 )
2012-08-20 15:38:33 -04:00
Stephen Kelly
1420691b35
Add new qt4_use_modules function.
2012-08-19 23:45:09 +02:00
Rolf Eike Beer
4be6783711
read less from version headers into variables
...
Instead of reading the whole file using file(READ) and later matching on the
whole file use file(STRINGS ... REGEX) to get only those lines we are
interested in at all. This will make the list much smaller (good for debugging)
and also the regular expressions will need to match on much smaller strings.
Also unset the content variables once they are not used anymore.
2012-08-19 13:54:56 +02:00
Rolf Eike Beer
637207e62a
do not escape spaces in regular expressions
...
The space has no special meaning in regular expressions so it doesn't need to
be escaped.
2012-08-19 11:49:56 +02:00
Philip Lowman
ad30210ccf
FindGTK2: Add GTK2_CAIROMMCONFIG_INCLUDE_DIR for cairommconfig.h
2012-08-18 17:56:46 -04:00
Philip Lowman
dd60ed2f4f
Merge topic 'lib64-cleanup' into FindOpenSceneGraph_13094
...
Resolved a few conflicts due to changes made in 13094 to paths
Conflicts:
Modules/FindOpenThreads.cmake
Modules/Findosg_functions.cmake
2012-08-18 17:03:18 -04:00
Philip Lowman
224b5dea78
FindOpenSceneGraph: CMake variable OSG_DIR influences detection now too
2012-08-18 16:46:08 -04:00
David Cole
3f9fa5cc7f
ProcessorCount: Mark find_program vars as advanced ( #13236 )
...
After each find_program call, mark_as_advanced each find result
variable to avoid polluting the cache with non-advanced variables
2012-08-17 10:56:05 -04:00
David Cole
e4e6ea0714
InstallRequiredSystemLibraries: Use correct file names ( #13315 )
...
The Spanish language MFC localization dll changed names from
VS 9 to 10. Use the correct file name ending with "esn.dll"
instead of the now non-existent one ending with "esp.dll"
Also, add the existing, but missing from our rules until now,
Russian language module.
Alphabetize the list while we're at it for easier reading in
the future.
We may want to consider adding some file(GLOB code here to
minimize the risk of missing files added in future versions
of VS.
2012-08-17 09:48:24 -04:00
Alex Neundorf
d97b38529e
Eclipse on OSX: fix handling of framework include dirs ( #13464 )
...
On OSX, the output from gcc looks like this:
/usr/include/c++/4.2.1
/usr/include/c++/4.2.1/i686-apple-darwin10/x86_64
/usr/include/c++/4.2.1/backward
/usr/lib/gcc/i686-apple-darwin10/4.2.1/include
/usr/include
/System/Library/Frameworks (framework directory)
/Library/Frameworks (framework directory)
End of search list.
The "(framework directory)" part needs to be removed so that Eclipse handles it properly
Alex
2012-08-16 23:02:10 +02:00
Clinton Stimpson
35c6ae8877
FindQt4: Give precedence to QTDIR environment variable, if set.
...
Remove old search paths that aren't needed.
Keep using PATHS instead of HINTS because a Windows machine may have
a different Qt in its PATH and putting QTDIR and the registry entry
ahead of PATH could cause apps to fail when run.
2012-08-16 07:31:17 -06:00
Brad King
91053cdf7b
ExternalProject: Add Mercurial (hg) repository support
...
Add options HG_REPOSITORY and HG_TAG to specify an external project
hosted in a Mercurial repository. Teach ExternalProject to clone the
repository and update from it. Extend the ExternalProject test to try a
Mercurial repository when hg is available.
2012-08-16 09:02:34 -04:00
Clinton Stimpson
0ddfc51f6a
Add -DNDEBUG to RelWithDebInfo flags where where Release flags had it.
...
Previously, it was inconsistent in that some platforms/compilers
had this flag for the RelWithDebInfo configuration and some didn't.
This fixes issue #11366 .
2012-08-15 20:00:45 -06:00
Clinton Stimpson
1e3248c9d0
DeployQt4: Include DESTDIR for some cpack generators.
2012-08-15 19:36:50 -06:00
Clinton Stimpson
213a9e5a7b
fphsa: clarify message about minimum required version found.
...
Thanks to Dubrovskiy Viacheslav.
2012-08-15 18:23:55 -06:00
Clinton Stimpson
5a6a3d4342
FindQt4: Give precedence to QTDIR environment variable, if set.
2012-08-15 18:20:16 -06:00
Clinton Stimpson
4a772a1686
Fix regex for qt minor version.
...
Thanks to Dubrovskiy Viacheslav and Sergei Epifanov for patch.
2012-08-15 18:14:40 -06:00
Marcin Wojdyr
84b49be8f0
Remove CMake multiline block-end command arguments
...
removing arguments omitted in 9db3116226
2012-08-15 16:50:29 -04:00
Rolf Eike Beer
dd784dde72
FindX11: avoid calling list(REMOVE_DUPLICATES) on an empty list
2012-08-15 19:28:50 +02:00