diff options
| author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-03-08 01:23:31 +0000 |
|---|---|---|
| committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-03-08 01:23:31 +0000 |
| commit | 93ceb90e9dee3b014c2144bf921dd68b7dcd0b65 (patch) | |
| tree | 198610bedabc30572e5d27cc402adbf67bcb227e | |
| parent | f2212350192dd3f045a90f985f1cfd86843800cf (diff) | |
| download | other-93ceb90e9dee3b014c2144bf921dd68b7dcd0b65.tar.gz other-93ceb90e9dee3b014c2144bf921dd68b7dcd0b65.zip | |
[kde-common/cmake] tde_automoc: fixed variable colision
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common@1224112 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | cmake/modules/TDEMacros.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmake/modules/TDEMacros.cmake b/cmake/modules/TDEMacros.cmake index 3a608c0..5764238 100644 --- a/cmake/modules/TDEMacros.cmake +++ b/cmake/modules/TDEMacros.cmake @@ -265,13 +265,14 @@ macro( tde_automoc ) # create header filename get_filename_component( _src_path "${_src_file}" ABSOLUTE ) get_filename_component( _src_path "${_src_path}" PATH ) - get_filename_component( _src_file "${_moc_file}" NAME_WE ) - set( _header_file "${_src_path}/${_src_file}.h" ) + get_filename_component( _src_header "${_moc_file}" NAME_WE ) + set( _header_file "${_src_path}/${_src_header}.h" ) # if header doesn't exists, check in META_INCLUDES if( NOT EXISTS "${_header_file}" ) + unset( _found ) foreach( _src_path ${_meta_includes} ) - set( _header_file "${_src_path}/${_src_file}.h" ) + set( _header_file "${_src_path}/${_src_header}.h" ) if( EXISTS "${_header_file}" ) set( _found 1 ) break( ) |