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

Move one include after the definition of CGAL_MODULES_DIR

This commit is contained in:
Guillaume Damiand 2018-10-19 10:18:37 +02:00
parent ebd04b0b4e
commit 8f61243a13
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ if(CGAL_BUILDING_LIBS)
list(APPEND CGAL_LIBRARIES CGAL_${comp}) list(APPEND CGAL_LIBRARIES CGAL_${comp})
endif() endif()
endforeach() endforeach()
include(${CGAL_MODULES_DIR}/CGAL_CreateSingleSourceCGALProgram.cmake) # We don't know yet CGAL_MODULES_DIR: include(${CGAL_MODULES_DIR}/CGAL_CreateSingleSourceCGALProgram.cmake)
return() return()
endif() endif()
@ -31,12 +31,10 @@ foreach(cgal_lib ${CGAL_LIBRARIES})
endif() endif()
endforeach() endforeach()
if(CGALConfig_all_targets_are_defined) if(CGALConfig_all_targets_are_defined)
include(${CGAL_MODULES_DIR}/CGAL_CreateSingleSourceCGALProgram.cmake) # We don't know yet CGAL_MODULES_DIR: include(${CGAL_MODULES_DIR}/CGAL_CreateSingleSourceCGALProgram.cmake)
return() return()
endif() endif()
include(${CGAL_MODULES_DIR}/CGAL_CreateSingleSourceCGALProgram.cmake)
message(STATUS "Using header-only CGAL") message(STATUS "Using header-only CGAL")
get_filename_component(CGAL_CONFIG_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) get_filename_component(CGAL_CONFIG_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
@ -137,6 +135,7 @@ endforeach()
# #
include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake) include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake)
include(${CGAL_MODULES_DIR}/CGAL_CreateSingleSourceCGALProgram.cmake)
# Temporary? Change the CMAKE module path # Temporary? Change the CMAKE module path
cgal_setup_module_path() cgal_setup_module_path()