diff options
| author | David Faure <faure@kde.org> | 2009-04-01 15:26:25 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2009-04-01 15:26:25 +0000 |
| commit | 4f6490f5fc3a2541af4aac5850e7eb9f171087d1 (patch) | |
| tree | 42d72618c47de8ff5dc4da0d898a75ff2649efff | |
| parent | 6eeed4de5687df7a65fdf1aa3771a17163a123e3 (diff) | |
| download | extra-cmake-modules-4f6490f5fc3a2541af4aac5850e7eb9f171087d1.tar.gz extra-cmake-modules-4f6490f5fc3a2541af4aac5850e7eb9f171087d1.tar.bz2 | |
Honour request from Alex to use _FILE for files, by using _FILENAME for "just the filename".
svn path=/trunk/KDE/kdelibs/; revision=947898
| -rw-r--r-- | modules/KDE4Macros.cmake | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 280fbd39..ce310ebf 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -66,25 +66,25 @@ macro (KDE4_ADD_KCFG_FILES _sources ) get_filename_component(_basename ${_tmp_FILE} NAME_WE) file(READ ${_tmp_FILE} _contents) - string(REGEX REPLACE "^(.*\n)?File=([^\n]+kcfg).*\n.*$" "\\2" _kcfg_FILE "${_contents}") + string(REGEX REPLACE "^(.*\n)?File=([^\n]+kcfg).*\n.*$" "\\2" _kcfg_FILENAME "${_contents}") set(_src_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp) set(_header_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) set(_moc_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc) - set(_kcfg_PATH ${_abs_PATH}/${_kcfg_FILE}) + set(_kcfg_FILE ${_abs_PATH}/${_kcfg_FILENAME}) # Maybe the .kcfg is a generated file? - if(NOT EXISTS "${_kcfg_PATH}") - set(_kcfg_PATH ${CMAKE_CURRENT_BINARY_DIR}/${_kcfg_FILE}) - endif(NOT EXISTS "${_kcfg_PATH}") - if(NOT EXISTS "${_kcfg_PATH}") - message(ERROR "${_kcfg_FILE} not found; tried in ${_abs_PATH} and ${CMAKE_CURRENT_BINARY_DIR}") - endif(NOT EXISTS "${_kcfg_PATH}") + if(NOT EXISTS "${_kcfg_FILE}") + set(_kcfg_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_kcfg_FILENAME}) + endif(NOT EXISTS "${_kcfg_FILE}") + if(NOT EXISTS "${_kcfg_FILE}") + message(ERROR "${_kcfg_FILENAME} not found; tried in ${_abs_PATH} and ${CMAKE_CURRENT_BINARY_DIR}") + endif(NOT EXISTS "${_kcfg_FILE}") # the command for creating the source file from the kcfg file add_custom_command(OUTPUT ${_header_FILE} ${_src_FILE} COMMAND ${KDE4_KCFGC_EXECUTABLE} - ARGS ${_kcfg_PATH} ${_tmp_FILE} -d ${CMAKE_CURRENT_BINARY_DIR} + ARGS ${_kcfg_FILE} ${_tmp_FILE} -d ${CMAKE_CURRENT_BINARY_DIR} MAIN_DEPENDENCY ${_tmp_FILE} - DEPENDS ${_kcfg_PATH} ${_KDE4_KCONFIG_COMPILER_DEP} ) + DEPENDS ${_kcfg_FILE} ${_KDE4_KCONFIG_COMPILER_DEP} ) if(_kcfg_generatemoc) qt4_generate_moc(${_header_FILE} ${_moc_FILE} ) |