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

Fix the pure-header-only CGALConfig.cmake, when installed

This commit is contained in:
Laurent Rineau 2017-12-06 12:53:46 +01:00
parent 777717ba7e
commit 06266211e6
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Installation/lib/cmake/CGAL/CGALConfig.cmake
View File

@ -22,7 +22,7 @@ set( CGAL_REQUESTED_COMPONENTS ${CGAL_FIND_COMPONENTS} )
set(CGAL_CURRENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(CGAL_CURRENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
function(_detect_branch_build VAR_NAME) function(_detect_branch_build VAR_NAME)
if(IS_DIRECTORY ${CGAL_CONFIG_DIR}/../../../../Installation) if(IS_DIRECTORY ${CGAL_CONFIG_DIR}/../../../../Installation/package_info/Installation/)
set(${VAR_NAME} TRUE PARENT_SCOPE) set(${VAR_NAME} TRUE PARENT_SCOPE)
else() else()
set(${VAR_NAME} FALSE PARENT_SCOPE) set(${VAR_NAME} FALSE PARENT_SCOPE)
@ -34,6 +34,7 @@ if(BRANCH_BUILD)
set(CGAL_ROOT ${CGAL_CONFIG_DIR}/../../../..) set(CGAL_ROOT ${CGAL_CONFIG_DIR}/../../../..)
set(CGAL_INSTALLATION_PACKAGE_DIR ${CGAL_ROOT}/Installation) set(CGAL_INSTALLATION_PACKAGE_DIR ${CGAL_ROOT}/Installation)
set(CGAL_GRAPHICSVIEW_PACKAGE_DIR ${CGAL_ROOT}/GraphicsView) set(CGAL_GRAPHICSVIEW_PACKAGE_DIR ${CGAL_ROOT}/GraphicsView)
set(CGAL_MODULES_DIR ${CGAL_ROOT}/Installation/cmake/modules)
file(GLOB packages_dirs ${CGAL_ROOT}/*) file(GLOB packages_dirs ${CGAL_ROOT}/*)
# message("packages_dirs: ${packages_dirs}") # message("packages_dirs: ${packages_dirs}")
foreach(package_dir ${packages_dirs}) foreach(package_dir ${packages_dirs})
@ -47,6 +48,15 @@ if(BRANCH_BUILD)
endif() endif()
endforeach() endforeach()
else() else()
# not BRANCH_BUILD: it can be an installed CGAL, or the tarball layout
if(EXISTS ${CGAL_CONFIG_DIR}/CGAL_add_test.cmake)
# installed CGAL
set(CGAL_MODULES_DIR ${CGAL_CONFIG_DIR})
else()
# tarball
set(CGAL_MODULES_DIR ${CGAL_ROOT}/cmake/modules)
endif()
set(CGAL_ROOT ${CGAL_CONFIG_DIR}/../../..) set(CGAL_ROOT ${CGAL_CONFIG_DIR}/../../..)
set(CGAL_INSTALLATION_PACKAGE_DIR ${CGAL_ROOT}) set(CGAL_INSTALLATION_PACKAGE_DIR ${CGAL_ROOT})
set(CGAL_GRAPHICSVIEW_PACKAGE_DIR ${CGAL_ROOT}) set(CGAL_GRAPHICSVIEW_PACKAGE_DIR ${CGAL_ROOT})
@ -60,7 +70,6 @@ if(NOT CGAL_FOUND)
return() return()
endif() endif()
set(CGAL_MODULES_DIR ${CGAL_CONFIG_DIR}/../../../cmake/modules)
list(APPEND CMAKE_MODULE_PATH ${CGAL_MODULES_DIR}) list(APPEND CMAKE_MODULE_PATH ${CGAL_MODULES_DIR})
include( ${CGAL_MODULES_DIR}/CGAL_SCM.cmake ) include( ${CGAL_MODULES_DIR}/CGAL_SCM.cmake )