diff options
| author | Alex Neundorf <neundorf@kde.org> | 2011-04-03 16:07:27 (GMT) |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2011-04-03 16:07:27 (GMT) |
| commit | 6a38cab2de2a529779c18e0c3872112e3851665b (patch) | |
| tree | 0477f145060cc9794a63f8f523bce176a8a23c96 | |
| parent | 4371147ef4549feeb88c080cf5ba99281cbb7df3 (diff) | |
| download | CMake-6a38cab2de2a529779c18e0c3872112e3851665b.zip CMake-6a38cab2de2a529779c18e0c3872112e3851665b.tar.gz CMake-6a38cab2de2a529779c18e0c3872112e3851665b.tar.bz2 | |
Don't skip the last builtin include dir for the Eclipse project file
The regex was slightly wrong, it excluded the last line, so e.g.
/usr/include/ didn't end up in the .cproject file.
Thanks to Shash Chatterjee for the patch.
Alex
| -rw-r--r-- | Modules/CMakeFindEclipseCDT4.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeFindEclipseCDT4.cmake b/Modules/CMakeFindEclipseCDT4.cmake index 4c58f56..a756e64 100644 --- a/Modules/CMakeFindEclipseCDT4.cmake +++ b/Modules/CMakeFindEclipseCDT4.cmake @@ -45,7 +45,7 @@ MACRO(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _resultIncludeDirs _resultDefines FILE(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy") # First find the system include dirs: - IF( "${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list" ) + IF( "${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+ *\n) *End of (search) list" ) # split the output into lines and then remove leading and trailing spaces from each of them: STRING(REGEX MATCHALL "[^\n]+\n" _includeLines "${CMAKE_MATCH_1}") @@ -54,7 +54,7 @@ MACRO(_DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _resultIncludeDirs _resultDefines LIST(APPEND ${_resultIncludeDirs} "${_includePath}") ENDFOREACH(nextLine) - ENDIF( "${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list" ) + ENDIF( "${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+ *\n) *End of (search) list" ) # now find the builtin macros: |