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

Create a build-tree and installation export file 

Add an export-name to libraries created with collect_cgal_library and
use it in install(EXPORT). Fake the behavior of export(EXPORT) by
looking for created targets manually.
This commit is contained in:
Philipp Möller 2015-06-23 16:27:58 +02:00
parent cbdb23172f
commit 8f7e338f33
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Installation/CMakeLists.txt
View File

@ -875,7 +875,8 @@ install(PROGRAMS ${scripts} DESTINATION ${CGAL_INSTALL_BIN_DIR})
install(DIRECTORY ${CGAL_MODULES_REL_DIR}/ DESTINATION ${CGAL_INSTALL_CMAKE_DIR} ) install(DIRECTORY ${CGAL_MODULES_REL_DIR}/ DESTINATION ${CGAL_INSTALL_CMAKE_DIR} )
install(FILES ${CGAL_MODULES_REL_DIR}/UseCGAL.cmake DESTINATION ${CGAL_INSTALL_CMAKE_DIR} ) install(FILES ${CGAL_MODULES_REL_DIR}/UseCGAL.cmake DESTINATION ${CGAL_INSTALL_CMAKE_DIR} )
install(EXPORT CGALExports DESTINATION ${CGAL_INSTALL_CMAKE_DIR}
NAMESPACE CGAL:: )
if ( GMP_IN_AUXILIARY ) if ( GMP_IN_AUXILIARY )
install(DIRECTORY auxiliary/gmp/include/ DESTINATION ${CGAL_INSTALL_INC_DIR} ) install(DIRECTORY auxiliary/gmp/include/ DESTINATION ${CGAL_INSTALL_INC_DIR} )

23
Installation/src/CMakeLists.txt
View File

@ -69,7 +69,7 @@ function (collect_cgal_library LIBRARY_NAME ADDITIONAL_FILES)
endif() endif()
endif(NOT CGAL_AUTO_LINK_ENABLED) endif(NOT CGAL_AUTO_LINK_ENABLED)
install(TARGETS ${LIBRARY_NAME} install(TARGETS ${LIBRARY_NAME} EXPORT CGALExports
RUNTIME DESTINATION ${CGAL_INSTALL_BIN_DIR} RUNTIME DESTINATION ${CGAL_INSTALL_BIN_DIR}
LIBRARY DESTINATION ${CGAL_INSTALL_LIB_DIR} LIBRARY DESTINATION ${CGAL_INSTALL_LIB_DIR}
ARCHIVE DESTINATION ${CGAL_INSTALL_LIB_DIR}) ARCHIVE DESTINATION ${CGAL_INSTALL_LIB_DIR})
@ -163,5 +163,26 @@ list(REMOVE_DUPLICATES CGAL_CONFIGURED_LIBRARIES)
list(SORT CGAL_CONFIGURED_LIBRARIES) list(SORT CGAL_CONFIGURED_LIBRARIES)
cache_set(CGAL_CONFIGURED_LIBRARIES "${CGAL_CONFIGURED_LIBRARIES}") cache_set(CGAL_CONFIGURED_LIBRARIES "${CGAL_CONFIGURED_LIBRARIES}")
# CGAL_CONFIGURED_LIBRARIES is a virtually useless variable, because
# we do not know if those components actually created a target. It
# might seem bad that we hardcode the target names here, but they have
# always been hardcoded in the CGALConfig files, so we do not make it
# any worse. We can also not use export(EXPORT) since that is only
# available in newer CMake versions.
set(CGAL_ACTUAL_CONFIGURED_LIBRARIES "")
macro(CGAL_add_if_target TARGET)
if(TARGET ${TARGET})
list(APPEND CGAL_ACTUAL_CONFIGURED_LIBRARIES ${TARGET})
endif()
endmacro()
CGAL_add_if_target(CGAL)
CGAL_add_if_target(CGAL_Core)
CGAL_add_if_target(CGAL_ImageIO)
CGAL_add_if_target(CGAL_Qt3)
CGAL_add_if_target(CGAL_Qt4)
export(TARGETS ${CGAL_ACTUAL_CONFIGURED_LIBRARIES} NAMESPACE CGAL:: FILE "${CMAKE_BINARY_DIR}/CGALExports.cmake")
message(STATUS "Sources for CGAL component libraries '${CGAL_CONFIGURED_LIBRARIES}' detected") message(STATUS "Sources for CGAL component libraries '${CGAL_CONFIGURED_LIBRARIES}' detected")