diff options
| author | Adrian Schroeter <adrian@suse.de> | 2010-05-17 04:47:23 +0000 |
|---|---|---|
| committer | Adrian Schroeter <adrian@suse.de> | 2010-05-17 04:47:23 +0000 |
| commit | 8c14801648860c04fe8ba84cdc8bf2244e4d84da (patch) | |
| tree | 54923966b9a3a29e4b29c6423699775a02e036f6 | |
| parent | f5a7eacec19610c37514bc28c5553b215dd81372 (diff) | |
| download | extra-cmake-modules-8c14801648860c04fe8ba84cdc8bf2244e4d84da.tar.gz extra-cmake-modules-8c14801648860c04fe8ba84cdc8bf2244e4d84da.tar.bz2 | |
do not die when using non-gcc compiler, for example clang++
svn path=/trunk/KDE/kdelibs/; revision=1127602
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 077e2257..8c67c8b2 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -1200,12 +1200,17 @@ if (CMAKE_COMPILER_IS_GNUCXX) string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}") # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here: if (NOT _gcc_version) - string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}") + string (REGEX MATCH ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${gcc_on_macos}") + if (gcc_on_macos) + string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}") + endif (gcc_on_macos) endif (NOT _gcc_version) - macro_ensure_version("4.1.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_1) - macro_ensure_version("4.2.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_2) - macro_ensure_version("4.3.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_3) + if (_gcc_version) + macro_ensure_version("4.1.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_1) + macro_ensure_version("4.2.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_2) + macro_ensure_version("4.3.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_3) + endif (_gcc_version) # save a little by making local statics not threadsafe # ### do not enable it for older compilers, see |