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

Merge pull request #3778 from lrineau/CGAL-fix_installed_header_only-GF 

Fix the *installed* header-only CGALConfig.cmake
This commit is contained in:
Laurent Rineau 2019-03-21 16:34:25 +01:00
parent b2b0d9d486 4782ea1665
commit 291a1f1221
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ function(cgal_detect_branch_build VAR_NAME)
endif() endif()
endfunction() endfunction()
set(CGAL_FOUND FALSE)
cgal_detect_branch_build(BRANCH_BUILD) cgal_detect_branch_build(BRANCH_BUILD)
if(BRANCH_BUILD) if(BRANCH_BUILD)
set(CGAL_ROOT ${CGAL_CONFIG_DIR}) set(CGAL_ROOT ${CGAL_CONFIG_DIR})
@ -44,8 +45,12 @@ if(BRANCH_BUILD)
else() else()
set(CGAL_ROOT ${CGAL_CONFIG_DIR}) set(CGAL_ROOT ${CGAL_CONFIG_DIR})
get_filename_component(CGAL_ROOT "${CGAL_ROOT}" DIRECTORY) get_filename_component(CGAL_ROOT "${CGAL_ROOT}" DIRECTORY)
get_filename_component(CGAL_ROOT "${CGAL_ROOT}" DIRECTORY) if(NOT EXISTS ${CGAL_ROOT}/include/CGAL/config.h)
get_filename_component(CGAL_ROOT "${CGAL_ROOT}" DIRECTORY) get_filename_component(CGAL_ROOT "${CGAL_ROOT}" DIRECTORY)
endif()
if(NOT EXISTS ${CGAL_ROOT}/include/CGAL/config.h)
get_filename_component(CGAL_ROOT "${CGAL_ROOT}" DIRECTORY)
endif()
# not BRANCH_BUILD: it can be an installed CGAL, or the tarball layout # not BRANCH_BUILD: it can be an installed CGAL, or the tarball layout
if(EXISTS ${CGAL_CONFIG_DIR}/CGAL_add_test.cmake) if(EXISTS ${CGAL_CONFIG_DIR}/CGAL_add_test.cmake)