songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5170 from maxGimeno/Installation-Fix_qt5_module-maxGimeno

This commit is contained in:
Laurent Rineau 2020-11-20 21:14:41 +01:00 committed by GitHub
parent 1cebf95ac7 f5c32f126f
commit 29c2ded01c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
GraphicsView/src/CGAL_Qt5/CMakeLists.txt
View File

@ -42,6 +42,16 @@ install(
DESTINATION "${CGAL_INSTALL_INC_DIR}/CGAL/Qt" DESTINATION "${CGAL_INSTALL_INC_DIR}/CGAL/Qt"
COMPONENT CGAL_Qt5) COMPONENT CGAL_Qt5)
if(CGAL_HEADER_ONLY) if(CGAL_HEADER_ONLY)
if(EXISTS ${CGAL_MODULES_DIR}/demo/resources)
install(
DIRECTORY "${CGAL_MODULES_DIR}/demo/resources/"
DESTINATION "${CGAL_INSTALL_CMAKE_DIR}/demo/resources"
COMPONENT CGAL_Qt5)
install(
DIRECTORY "${CGAL_MODULES_DIR}/demo/icons/"
DESTINATION "${CGAL_INSTALL_CMAKE_DIR}/demo/icons"
COMPONENT CGAL_Qt5)
else()
install( install(
DIRECTORY "../../demo/resources/" DIRECTORY "../../demo/resources/"
DESTINATION "${CGAL_INSTALL_CMAKE_DIR}/demo/resources" DESTINATION "${CGAL_INSTALL_CMAKE_DIR}/demo/resources"
@ -50,6 +60,7 @@ if(CGAL_HEADER_ONLY)
DIRECTORY "../../demo/icons/" DIRECTORY "../../demo/icons/"
DESTINATION "${CGAL_INSTALL_CMAKE_DIR}/demo/icons" DESTINATION "${CGAL_INSTALL_CMAKE_DIR}/demo/icons"
COMPONENT CGAL_Qt5) COMPONENT CGAL_Qt5)
endif()
endif() endif()
message("libCGAL_Qt5 is configured") message("libCGAL_Qt5 is configured")

2
Scripts/developer_scripts/cgal_create_release_with_cmake.cmake
View File

@ -158,6 +158,8 @@ if(EXISTS ${GIT_REPO}/Maintenance/release_building/public_release_name)
file(COPY "${GIT_REPO}/Maintenance/release_building/public_release_name" file(COPY "${GIT_REPO}/Maintenance/release_building/public_release_name"
DESTINATION "${release_dir}/doc") DESTINATION "${release_dir}/doc")
endif() endif()
file(COPY ${GIT_REPO}/GraphicsView/demo/resources ${GIT_REPO}/GraphicsView/demo/icons
DESTINATION "${release_dir}/cmake/modules")
#create VERSION #create VERSION
file(WRITE ${release_dir}/VERSION "${CGAL_VERSION}") file(WRITE ${release_dir}/VERSION "${CGAL_VERSION}")