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

Add a variable CGAL_CURRENT_SOURCE_DIR 

Save the current source directory to `CGAL_CURRENT_SOURCE_DIR`. The
variable value is modified by a `CMakeLists.txt` file when it is
generated by `cgal_create_cmake_script` in the binary tree. The script
`cgal_create_cmake_script` itself it called by CMake, by the function
`process_CGAL_subdirectory` (see its definition in
`Installation/cmake/modules/CGAL_Macros.cmake`), called in
`(examples|test|demo)/CMakeLists.txt`.

Eventually, that variable value is supposed to be the directory to the
current sources, even if the current `CMakeLists.txt` is within the
binary tree.

That is used in `CGAL_CreateSingleSourceCGALProgram.cmake` for the CTest
support, so set correctly the current working directory (in the
directory of the tests/examples).
This commit is contained in:
Laurent Rineau 2016-08-23 14:25:53 +02:00
parent c30560143b
commit 545e80f18e
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake
View File

@ -1,7 +1,7 @@
function(create_single_source_cgal_program firstfile ) function(create_single_source_cgal_program firstfile )
if(NOT IS_ABSOLUTE "${firstfile}") if(NOT IS_ABSOLUTE "${firstfile}")
set(firstfile "${CMAKE_CURRENT_SOURCE_DIR}/${firstfile}") set(firstfile "${CGAL_CURRENT_SOURCE_DIR}/${firstfile}")
endif() endif()
get_filename_component(exe_name ${firstfile} NAME_WE) get_filename_component(exe_name ${firstfile} NAME_WE)
@ -12,14 +12,14 @@ function(create_single_source_cgal_program firstfile )
# remaining files # remaining files
foreach( i ${ARGN} ) foreach( i ${ARGN} )
set( all ${all} ${CMAKE_CURRENT_SOURCE_DIR}/${i} ) set( all ${all} ${CGAL_CURRENT_SOURCE_DIR}/${i} )
endforeach() endforeach()
add_executable(${exe_name} ${all}) add_executable(${exe_name} ${all})
if(BUILD_TESTING) if(BUILD_TESTING)
set(cin_file "${CMAKE_CURRENT_SOURCE_DIR}/${exe_name}.cin") set(cin_file "${CGAL_CURRENT_SOURCE_DIR}/${exe_name}.cin")
if(EXISTS ${cin_file}) if(EXISTS ${cin_file})
add_test(NAME ${exe_name} add_test(NAME ${exe_name}
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
@ -30,7 +30,7 @@ function(create_single_source_cgal_program firstfile )
else() else()
# TODO: deal with shell globbing; if the `cmd` file contains # TODO: deal with shell globbing; if the `cmd` file contains
# a `*`, then interprete the command using bash. # a `*`, then interprete the command using bash.
set(cmd_file "${CMAKE_CURRENT_SOURCE_DIR}/${exe_name}.cmd") set(cmd_file "${CGAL_CURRENT_SOURCE_DIR}/${exe_name}.cmd")
if(EXISTS ${cmd_file}) if(EXISTS ${cmd_file})
file(STRINGS "${cmd_file}" CMD_LINES) file(STRINGS "${cmd_file}" CMD_LINES)
set(ARGS) set(ARGS)
@ -38,7 +38,7 @@ function(create_single_source_cgal_program firstfile )
foreach(CMD_LINE ${CMD_LINES}) foreach(CMD_LINE ${CMD_LINES})
# message(STATUS " command line: ${CMD_LINE}") # message(STATUS " command line: ${CMD_LINE}")
separate_arguments(CMD_LINE_ARGS UNIX_COMMAND ${CMD_LINE}) separate_arguments(CMD_LINE_ARGS UNIX_COMMAND ${CMD_LINE})
# message(STATUS " args: ${CMD_LINE_ARGS}") # message(STATUS " args: ${CMD_LINE_ARGS}")
list(APPEND ARGS ${CMD_LINE_ARGS}) list(APPEND ARGS ${CMD_LINE_ARGS})
endforeach() endforeach()
endif() endif()
@ -47,8 +47,9 @@ function(create_single_source_cgal_program firstfile )
endif() endif()
set_property(TEST "${exe_name}" set_property(TEST "${exe_name}"
APPEND PROPERTY LABELS "${PROJECT_NAME}") APPEND PROPERTY LABELS "${PROJECT_NAME}")
# message(STATUS " workding dir: ${CGAL_CURRENT_SOURCE_DIR}")
set_property(TEST "${exe_name}" set_property(TEST "${exe_name}"
PROPERTY WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) PROPERTY WORKING_DIRECTORY ${CGAL_CURRENT_SOURCE_DIR})
endif(BUILD_TESTING) endif(BUILD_TESTING)
add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${exe_name} ) add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${exe_name} )

5
Installation/cmake/modules/UseCGAL.cmake
View File

@ -9,6 +9,11 @@ include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake)
cgal_setup_module_path() cgal_setup_module_path()
# Save the current source directory. That variable can be changed by
# a `CMakeLists.txt`, for `CMakeLists.txt` files that are created in
# the binary directory.
set(CGAL_CURRENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
if(NOT USE_CGAL_FILE_INCLUDED) if(NOT USE_CGAL_FILE_INCLUDED)
set(USE_CGAL_FILE_INCLUDED 1) set(USE_CGAL_FILE_INCLUDED 1)

4
Scripts/scripts/cgal_create_cmake_script
View File

@ -58,6 +58,10 @@ if ( CGAL_FOUND )
include( CGAL_CreateSingleSourceCGALProgram ) include( CGAL_CreateSingleSourceCGALProgram )
EOF EOF
if [ -d "${SOURCE_DIR}" ] ; then
echo " set(CGAL_CURRENT_SOURCE_DIR \"${SOURCE_DIR}\")"
echo
fi
if [ -d "${SOURCE_DIR}../../include" ] ; then if [ -d "${SOURCE_DIR}../../include" ] ; then
echo " include_directories (BEFORE \"${SOURCE_DIR}../../include\")" echo " include_directories (BEFORE \"${SOURCE_DIR}../../include\")"
echo echo