From e87fd4478ac38e7d6e86937532e97e832d28b4f0 Mon Sep 17 00:00:00 2001 From: Andreas Schenk <andreas_schenk@hms.harvard.edu> Date: Wed, 15 Aug 2012 19:05:23 -0400 Subject: [PATCH] fixed pyfile staging --- cmake_support/OST.cmake | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cmake_support/OST.cmake b/cmake_support/OST.cmake index 1e3e66444..e6dfb2ae0 100644 --- a/cmake_support/OST.cmake +++ b/cmake_support/OST.cmake @@ -439,7 +439,7 @@ endmacro() #------------------------------------------------------------------------------- macro(ui_to_python LIBNAME STAGEDIR) set(_input_files ${ARGN}) - add_custom_target("${LIBNAME}_ui") + add_custom_target("${LIBNAME}_ui" ALL) find_program(_PYUIC_EXECUTABLE NAMES pyuic4-${PYTHON_VERSION} pyuic4 pyuic PATHS ENV PATH @@ -579,10 +579,10 @@ macro(pymod) #----------------------------------------------------------------------------- # compile python files #----------------------------------------------------------------------------- -if (_ARG_PY) + if (_ARG_PY) parse_file_list("${_ARG_PY}" _PYFILE_MAP) map(KEYS _PYFILE_MAP _PYFILE_MAP_KEYS) - foreach(_DIR ${_HEADER_MAP_KEYS}) + foreach(_DIR ${_PYFILE_MAP_KEYS}) map(GET _PYFILE_MAP ${_DIR} _PY_FILES) set(_ABS_PY_FILES) set(_PY_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${_DIR}") @@ -591,11 +591,12 @@ if (_ARG_PY) endforeach() install(FILES ${_ABS_PY_FILES} DESTINATION "${LIB_DIR}/${PYMOD_DIR}/${_DIR}") string(REPLACE "/" "_" _DIR_NO_SLASH "${_DIR}") - string(REPLACE "._" "" _DIR_NO_SLASH "${_DIR_NO_SLASH}") - add_custom_target("${_ARG_NAME}_${_DIR_NO_SLASH}_pymod" ALL) + set(_PYMOD_TARGET "${_LIB_NAME}_${_DIR_NO_SLASH}_pymod") + string(REPLACE "_." "" _PYMOD_TARGET "${_PYMOD_TARGET}") + add_custom_target(${_PYMOD_TARGET} ALL) copy_if_different("./" "${PYMOD_STAGE_DIR}/${_DIR}" "${_ABS_PY_FILES}" "TARGETS" - "${_ARG_NAME}_${_DIR_NO_SLASH}_pymod") + "${_PYMOD_TARGET}") compile_py_files(_${_LIB_NAME} ${PYMOD_STAGE_DIR}/${_DIR} ${_ABS_PY_FILES}) endforeach() endif() -- GitLab