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

now I got it: it's not just the first argument, it's the first file 

"first" is a little bit general name for a parameter, changed
to firstfile and added a comment about handling other files
This commit is contained in:
Eric Berberich 2012-08-03 12:57:04 +00:00
parent 293a072b43
commit 2f6dae6bbb
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,18 +1,20 @@
function(create_single_source_cgal_program file ) function(create_single_source_cgal_program firstfile )
if(NOT IS_ABSOLUTE "${file}") if(NOT IS_ABSOLUTE "${firstfile}")
set(file "${CMAKE_CURRENT_SOURCE_DIR}/${file}") set(file "${CMAKE_CURRENT_SOURCE_DIR}/${firstfile}")
endif() endif()
if(EXISTS "${file}") if(EXISTS "${firstfile}")
set( all "${file}" ) set( all "${firstfile}" )
# remaining files
foreach( i ${ARGN} ) foreach( i ${ARGN} )
set( all ${all} ${CMAKE_CURRENT_SOURCE_DIR}/${i} ) set( all ${all} ${CMAKE_CURRENT_SOURCE_DIR}/${i} )
endforeach() endforeach()
get_filename_component(exe_name ${file} NAME_WE)
get_filename_component(exe_name ${firstfile} NAME_WE)
add_executable(${exe_name} ${all}) add_executable(${exe_name} ${all})
add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${exe_name} ) add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${exe_name} )

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

@ -1,14 +1,15 @@
macro(create_single_source_cgal_program_qt4 file ) macro(create_single_source_cgal_program_qt4 firstfile )
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${firstfile})
set( all ${CMAKE_CURRENT_SOURCE_DIR}/${file} ) set( all ${CMAKE_CURRENT_SOURCE_DIR}/${firstfile} )
# remaining files
foreach( i ${ARGN} ) foreach( i ${ARGN} )
set( all ${all} ${CMAKE_CURRENT_SOURCE_DIR}/${i} ) set( all ${all} ${CMAKE_CURRENT_SOURCE_DIR}/${i} )
endforeach() endforeach()
get_filename_component(exe_name ${file} NAME_WE) get_filename_component(exe_name ${firstfile} NAME_WE)
# UI files (Qt Designer files) # UI files (Qt Designer files)
qt4_wrap_ui( DT_UI_FILES ${exe_name}.ui ) qt4_wrap_ui( DT_UI_FILES ${exe_name}.ui )
@ -22,7 +23,7 @@ macro(create_single_source_cgal_program_qt4 file )
add_executable(${exe_name} ${all}) add_executable(${exe_name} ${all})
add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${exe_name} ) add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${exe_name} )
# Link the executable to CGAL and third-party libraries # Link the executable to CGAL and third-party libraries
if ( CGAL_AUTO_LINK_ENABLED ) if ( CGAL_AUTO_LINK_ENABLED )