diff options
| author | Andreas K. Huettel (dilfridge) <mail@akhuettel.de> | 2012-06-08 19:59:13 +0200 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <mail@akhuettel.de> | 2012-06-08 19:59:13 +0200 |
| commit | ca80124b77f34265e1914fdcf596a08b9a862c4b (patch) | |
| tree | 9f52598139bf71c3a74e530e8446eca5b2fd2776 /eclass/kde4-meta.eclass | |
| parent | 4d80af34d97cfe8816663a282cc4c22b83354a12 (diff) | |
| download | kde-ca80124b77f34265e1914fdcf596a08b9a862c4b.tar.gz kde-ca80124b77f34265e1914fdcf596a08b9a862c4b.tar.bz2 kde-ca80124b77f34265e1914fdcf596a08b9a862c4b.zip | |
[eclass] No #DONOTCOMPILE if add_subdirectory has a variable parameter ("${...")
Diffstat (limited to 'eclass/kde4-meta.eclass')
| -rw-r--r-- | eclass/kde4-meta.eclass | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index d6388e8b077..52780d7117c 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -488,6 +488,13 @@ kde4-meta_change_cmakelists() { -i CMakeLists.txt || die "${LINENO}: cmake sed died" fi + # Restore "add_subdirectory( ${ ..." (this is done in kdesdk) + if [[ -f CMakeLists.txt ]]; then + sed -e '/add_subdirectory[[:space:]]*([[:space:]]*\${/s/^#DONOTCOMPILE //' \ + -e '/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*\${/s/^#DONOTCOMPILE //' \ + -i CMakeLists.txt || die "${LINENO}: cmake sed died" + fi + if [[ -z ${KMNOMODULE} ]]; then # Restore "add_subdirectory" in $KMMODULE subdirectories find "${S}"/${KMMODULE} -name CMakeLists.txt -print0 | \ |