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

fix: support for leda specfiles

This commit is contained in:
Andreas Meyer 2006-07-20 13:29:54 +00:00
parent b149e02527
commit 1151a0e3f3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Installation/install_cgal
View File

@ -493,7 +493,7 @@ parse_support_options()
# read those from the specfile # read those from the specfile
for j in DESCRIPTION CXXFLAGS LDFLAGS LIBS REQUIRES INCOMPATIBLE \ for j in DESCRIPTION CXXFLAGS LDFLAGS LIBS REQUIRES INCOMPATIBLE \
STDINCLDIRS INCLTHING STDLIBDIRS LIBTHING STDINCLDIRS INCLTHING STDLIBDIRS LIBTHING COMPILETESTFLAGS
do do
try_to_get_var_from_file "${j}" "${i}" try_to_get_var_from_file "${j}" "${i}"
eval ${_tmp}_${j}=\"`value_of ${j}`\" eval ${_tmp}_${j}=\"`value_of ${j}`\"
@ -1627,7 +1627,7 @@ _test_support()
while [ 0 ]; do while [ 0 ]; do
# a) try with current flags # a) try with current flags
log_print " Testing with default flags." log_print " Testing with default flags."
if _compile_test "${DESCRIPTION}" "${tmp_cxxflags} " "${2}" && \ if _compile_test "${DESCRIPTION}" "${tmp_cxxflags} ${tmp_compiletestflags}" "${2}" && \
_link_run_test "${DESCRIPTION}" \ _link_run_test "${DESCRIPTION}" \
"${tmp_libpathflags} `rpath_directive \"${tmp_runtimepath}\"`" \ "${tmp_libpathflags} `rpath_directive \"${tmp_runtimepath}\"`" \
"${tmp_ldflags} " \ "${tmp_ldflags} " \
@ -1659,7 +1659,7 @@ _test_support()
if [ ! -r "${kk}" ]; then continue; fi if [ ! -r "${kk}" ]; then continue; fi
log_print " - Trying ${kk}." log_print " - Trying ${kk}."
if _compile_test "${DESCRIPTION} with include ${kk}" \ if _compile_test "${DESCRIPTION} with include ${kk}" \
"${tmp_cxxflags} `include_dir_option \"${kk}\"`" \ "${tmp_cxxflags} ${tmp_compiletestflags} `include_dir_option \"${kk}\"`" \
"${2}" "${2}"
then then
# first try without additional libdir flags, maybe its headers only... # first try without additional libdir flags, maybe its headers only...
@ -1786,6 +1786,7 @@ _check_incompatibilities()
set_package_cxxflags() set_package_cxxflags()
{ {
tmp_cxxflags="`value_of \"${1}_CXXFLAGS\"`" tmp_cxxflags="`value_of \"${1}_CXXFLAGS\"`"
tmp_compiletestflags="`value_of \"${1}_COMPILETESTFLAGS\"`"
} }
# set the variable tmp_cxxflags for feature $1 # set the variable tmp_cxxflags for feature $1