diff --git a/etc/cmake/UseArmarXGui.cmake b/etc/cmake/UseArmarXGui.cmake index 9df77fe2187ed43183bedc91a9bd318769c19643..fa9182b20ac2e4c595b33044e254d42c4fc16219 100644 --- a/etc/cmake/UseArmarXGui.cmake +++ b/etc/cmake/UseArmarXGui.cmake @@ -59,7 +59,7 @@ function(armarx_gui_library PLUGIN_NAME SOURCES QT_MOC_HDRS QT_UIS QT_RESOURCES ARGS "-DPROJECT_NAME=${PROJECT_NAME}" "-DDIR=${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}_autogen/include/" "-DCORRECT_INCLUDE=${CORRECT_INCLUDE}" "-DPROJECT_SOURCE_DIR=${CMAKE_SOURCE_DIR}/source" "-P" "${ArmarXGui_CMAKE_DIR}/check_qt_moc_includes.cmake" - COMMENT "Checking qt moc includes " + #COMMENT "Checking qt moc includes" ) diff --git a/etc/cmake/check_qt_moc_includes.cmake b/etc/cmake/check_qt_moc_includes.cmake index 54090f31e3e4be6395f4fff7e8ffcc2a811e993b..73f316d01670cdf835f60ce778ac444605e96c79 100644 --- a/etc/cmake/check_qt_moc_includes.cmake +++ b/etc/cmake/check_qt_moc_includes.cmake @@ -2,6 +2,7 @@ file(GLOB_RECURSE file_list ${DIR} LIST_DIRECTORIES FALSE RELATIVE ${DIR} ui_*.h foreach(header_file IN LISTS file_list) if(NOT header_file MATCHES "${PROJECT_NAME}/") file(MAKE_DIRECTORY "${DIR}${CORRECT_INCLUDE}") + message("Moving ${DIR}${header_file} to ${DIR}${CORRECT_INCLUDE}/${header_file}") file(RENAME "${DIR}${header_file}" "${DIR}${CORRECT_INCLUDE}/${header_file}") execute_process(COMMAND bash "-c" "find ${PROJECT_SOURCE_DIR} -type f -exec sed -i 's~include \\\"${header_file}\\\"~include <${CORRECT_INCLUDE}/${header_file}>~g' {} +") message(WARNING "The include for ${header_file} needs to use the full relative path, instead of a path without any directories. This is needed for correct installation. The correct include might be (or similar, subfolders might be missing in the proposed include) \n'#include <${CORRECT_INCLUDE}/${header_file}>'")