diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cmake/FindPHP5.cmake | 8 | ||||
| -rw-r--r-- | contrib/cmake/USCXMLMacros.cmake | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/cmake/FindPHP5.cmake b/contrib/cmake/FindPHP5.cmake index eee8e3f..fded5fd 100644 --- a/contrib/cmake/FindPHP5.cmake +++ b/contrib/cmake/FindPHP5.cmake @@ -1,8 +1,8 @@ if (UNIX) - if (APPLE) - # mavericks broke it - will look into it eventually - return() - endif() + # if (APPLE) + # # mavericks broke it - will look into it eventually + # return() + # endif() if (NOT PHP_CONFIG) find_program(PHP_CONFIG NAMES php-config diff --git a/contrib/cmake/USCXMLMacros.cmake b/contrib/cmake/USCXMLMacros.cmake index 082caa0..aa48bcf 100644 --- a/contrib/cmake/USCXMLMacros.cmake +++ b/contrib/cmake/USCXMLMacros.cmake @@ -68,7 +68,7 @@ SET(TWO_PART_VERSION_REGEX "[0-9]+\\.[0-9]+") MACRO(THREE_PART_VERSION_TO_VARS version major minor patch) IF(${version} MATCHES ${THREE_PART_VERSION_REGEX}) STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" ${major} "${version}") - STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" ${minor} "${version}") + STRING(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+" "\\1" ${minor} "${version}") STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" ${patch} "${version}") ELSEIF(${version} MATCHES ${TWO_PART_VERSION_REGEX}) STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+" "\\1" ${major} "${version}") |