diff --git a/cmake_support/OST.cmake b/cmake_support/OST.cmake
index 6190ef360d50a0419e0856c14568daad914478eb..f392eb87efd7054720015ac739ed908bec5c1571 100644
--- a/cmake_support/OST.cmake
+++ b/cmake_support/OST.cmake
@@ -406,9 +406,10 @@ macro(compile_py_files module out_dir)
     get_filename_component(_out_file ${input_file} NAME_WE)
     get_filename_component(_in_file ${input_file} ABSOLUTE)
     set(_out_file ${out_dir}/${_out_file}.pyc)
+    get_filename_component(_in_name ${input_file} NAME)
     file(MAKE_DIRECTORY  ${out_dir})
     add_custom_command(TARGET ${module}
-                       COMMAND ${PYTHON_BINARY} -c "import py_compile;py_compile.compile(\"${_in_file}\",\"${_out_file}\",doraise=True)"
+                       COMMAND ${PYTHON_BINARY} -c "import py_compile;py_compile.compile(\"${_in_file}\",\"${_out_file}\",\"${_in_name}\",doraise=True)"
                        VERBATIM DEPENDS ${input_file}
                        )
   endforeach()
@@ -515,9 +516,9 @@ macro(pymod)
                   "${LIB_DIR}/${PYMOD_DIR}/${_DIR}")
           string(REPLACE "/" "_" _DIR_NO_SLASH "${_DIR}")
           add_custom_target("${_ARG_NAME}_${_DIR_NO_SLASH}_pymod" ALL)
-          #copy_if_different("./" "${PYMOD_STAGE_DIR}/${_DIR}"
-          #                  "${_ABS_PY_FILES}" "TARGETS"
-          #                  "${_ARG_NAME}_${_DIR_NO_SLASH}_pymod")
+          copy_if_different("./" "${PYMOD_STAGE_DIR}/${_DIR}"
+                            "${_ABS_PY_FILES}" "TARGETS"
+                            "${_ARG_NAME}_${_DIR_NO_SLASH}_pymod")
           compile_py_files(_${_LIB_NAME} ${PYMOD_STAGE_DIR}/${_DIR} ${_ABS_PY_FILES})
           set(_PY_FILES)
         else()
@@ -530,9 +531,9 @@ macro(pymod)
       if (_ARG_UI)
         add_dependencies("${_LIB_NAME}_pymod" "${_LIB_NAME}_ui"})
       endif()
-      #copy_if_different("./" "${PYMOD_STAGE_DIR}" "${_PY_FILES}" "TARGETS"
-      #                  "${_LIB_NAME}_pymod")
-      #add_dependencies("_${_LIB_NAME}" "${_LIB_NAME}_pymod")
+      copy_if_different("./" "${PYMOD_STAGE_DIR}" "${_PY_FILES}" "TARGETS"
+                        "${_LIB_NAME}_pymod")
+      add_dependencies("_${_LIB_NAME}" "${_LIB_NAME}_pymod")
       compile_py_files(_${_LIB_NAME} ${PYMOD_STAGE_DIR} ${_PY_FILES})
       include_directories(${PYTHON_INCLUDE_PATH})
       install(FILES ${_PY_FILES} DESTINATION "${LIB_DIR}/${PYMOD_DIR}")