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

Fix when CGAL_USE_FILE is not included

This commit is contained in:
Laurent Rineau 2019-07-25 16:13:08 +02:00
parent a17c0d628d
commit fbf163d244
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Installation/cmake/modules/CGALConfig_binary.cmake.in
View File

@ -180,6 +180,7 @@ set(CGAL_DISABLE_GMP "@CGAL_DISABLE_GMP@")
include(${CGAL_MODULES_DIR}/CGAL_CreateSingleSourceCGALProgram.cmake) include(${CGAL_MODULES_DIR}/CGAL_CreateSingleSourceCGALProgram.cmake)
include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake) include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake)
include(${CGAL_MODULES_DIR}/CGAL_TweakFindBoost.cmake) include(${CGAL_MODULES_DIR}/CGAL_TweakFindBoost.cmake)
include(${CGAL_MODULES_DIR}/CGAL_target_use_TBB.cmake)
# Temporary? Change the CMAKE module path # Temporary? Change the CMAKE module path
cgal_setup_module_path() cgal_setup_module_path()

1
Installation/cmake/modules/CGALConfig_install.cmake.in
View File

@ -155,6 +155,7 @@ set(CGAL_DISABLE_GMP "@CGAL_DISABLE_GMP@")
include(${CGAL_MODULES_DIR}/CGAL_CreateSingleSourceCGALProgram.cmake) include(${CGAL_MODULES_DIR}/CGAL_CreateSingleSourceCGALProgram.cmake)
include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake) include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake)
include(${CGAL_MODULES_DIR}/CGAL_TweakFindBoost.cmake) include(${CGAL_MODULES_DIR}/CGAL_TweakFindBoost.cmake)
include(${CGAL_MODULES_DIR}/CGAL_target_use_TBB.cmake)
# Temporary? Change the CMAKE module path # Temporary? Change the CMAKE module path
cgal_setup_module_path() cgal_setup_module_path()

1
Installation/cmake/modules/CGAL_Common.cmake
View File

@ -61,6 +61,5 @@ if( NOT CGAL_COMMON_FILE_INCLUDED )
# set use-file for Eigen3 (needed to have default solvers) # set use-file for Eigen3 (needed to have default solvers)
set(EIGEN3_USE_FILE "UseEigen3") set(EIGEN3_USE_FILE "UseEigen3")
set(TBB_USE_FILE "UseTBB")
include(${CMAKE_CURRENT_LIST_DIR}/CGAL_target_use_TBB.cmake) include(${CMAKE_CURRENT_LIST_DIR}/CGAL_target_use_TBB.cmake)
endif() endif()

2
Installation/cmake/modules/CGAL_target_use_TBB.cmake
View File

@ -3,6 +3,8 @@ if (CGAL_target_use_TBB_included)
endif() endif()
set(CGAL_target_use_TBB_included TRUE) set(CGAL_target_use_TBB_included TRUE)
set(TBB_USE_FILE "UseTBB")
function(CGAL_target_use_TBB target) function(CGAL_target_use_TBB target)
if(NOT TARGET Threads::Threads) if(NOT TARGET Threads::Threads)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)