From a69acc5712ca27e2df7fda2d4ea8f04981ed7d9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mirko=20W=C3=A4chter?= <mirko.waechter@kit.edu>
Date: Wed, 21 Aug 2019 18:14:49 +0200
Subject: [PATCH] qt moc fix: create directory correctly
---
etc/cmake/check_qt_moc_includes.cmake | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/etc/cmake/check_qt_moc_includes.cmake b/etc/cmake/check_qt_moc_includes.cmake
index 73f316d0..7a0664e4 100644
--- a/etc/cmake/check_qt_moc_includes.cmake
+++ b/etc/cmake/check_qt_moc_includes.cmake
@@ -1,10 +1,12 @@
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}")
+ get_filename_component(HEADER_FILE_DIR ${header_file} DIRECTORY)
+ file(MAKE_DIRECTORY "${DIR}${CORRECT_INCLUDE}/${HEADER_FILE_DIR}")
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("find ${PROJECT_SOURCE_DIR} -type f -exec sed -i 's~include \\\"${header_file}\\\"~include <${CORRECT_INCLUDE}/${header_file}>~g' {} +")
+ #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}>'")
endif()
endforeach()
--
GitLab