From 8645e59f0009af1caea8cc5ccebfe52240836213 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Wed, 12 Feb 2020 11:54:01 +0100 Subject: [PATCH] Fix Qt5 COMPONENT installation and don't copy Qt/* at installation step. --- GraphicsView/src/CGAL_Qt5/CMakeLists.txt | 2 +- Installation/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GraphicsView/src/CGAL_Qt5/CMakeLists.txt b/GraphicsView/src/CGAL_Qt5/CMakeLists.txt index 224de8bbe4b..c9ab3d99241 100644 --- a/GraphicsView/src/CGAL_Qt5/CMakeLists.txt +++ b/GraphicsView/src/CGAL_Qt5/CMakeLists.txt @@ -31,8 +31,8 @@ if(COMMAND add_config_flag) add_config_flag( CGAL_HAS_QT5 ) endif() +install(DIRECTORY "../../include/CGAL/Qt/" DESTINATION "${CGAL_INSTALL_INC_DIR}/CGAL/Qt" COMPONENT CGAL_Qt5) if (CGAL_HEADER_ONLY) - install(DIRECTORY "../../include/CGAL/Qt/" DESTINATION "${CGAL_INSTALL_INC_DIR}/CGAL/include/CGAL/Qt" COMPONENT CGAL_Qt5) install(DIRECTORY "../../demo/resources/" DESTINATION "${CGAL_INSTALL_CMAKE_DIR}/demo/resources" COMPONENT CGAL_Qt5) install(DIRECTORY "../../demo/icons/" DESTINATION "${CGAL_INSTALL_CMAKE_DIR}/demo/icons" COMPONENT CGAL_Qt5) endif() diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index c149c941c4e..1f7f9a7bae7 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -891,11 +891,11 @@ endif() foreach (dir ${CGAL_CONFIGURED_PACKAGES}) if (EXISTS ${dir}/include/CGAL) - install(DIRECTORY ${dir}/include/CGAL DESTINATION ${CGAL_INSTALL_INC_DIR} PATTERN ".svn" EXCLUDE) + install(DIRECTORY ${dir}/include/CGAL DESTINATION ${CGAL_INSTALL_INC_DIR} PATTERN ".svn" EXCLUDE PATTERN "Qt" EXCLUDE) endif() endforeach() if(EXISTS ${CMAKE_BINARY_DIR}/include/CGAL) - install(DIRECTORY ${CMAKE_BINARY_DIR}/include/CGAL DESTINATION ${CGAL_INSTALL_INC_DIR} PATTERN ".svn" EXCLUDE) + install(DIRECTORY ${CMAKE_BINARY_DIR}/include/CGAL DESTINATION ${CGAL_INSTALL_INC_DIR} PATTERN ".svn" EXCLUDE PATTERN "Qt" EXCLUDE) endif() file(GLOB scripts "scripts/*")