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

support MIPSPRO CC 7.2 

some fixes for systems without RUNTIME_LINKER_FLAG
handle new example dir structure correctly
one more link_gmp fix :)
This commit is contained in:
Michael Hoffmann 1997-11-27 16:03:46 +00:00
parent 06ec93d180
commit c82d00b989
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Packages/Installation/install_cgal
View File

@ -583,8 +583,16 @@ _sunpro_version()
# give version numbers for IRIX MIPSPRO CC # give version numbers for IRIX MIPSPRO CC
_sgi_version() _sgi_version()
{ {
${_printf} "`$_showprods -nM | $_fgrep \"C++,\" | $_fgrep c++_dev | \ case ${SYST} in
${_awk} '{print $5}'`" *IRIX*5.*)
${_printf} "`${_showprods} -nM | ${_fgrep} \"C++,\" | \
${_fgrep} c++_dev | ${_awk} '{print $5}'`"
;;
*IRIX*6.*)
${_printf} "`${_showprods} -nM | ${_fgrep} \"c++_dev\" | \
${_fgrep} \"irix\" | ${_awk} '{print $(NF-3)}'`"
;;
esac
} }
# return the cmdline-switch to add directory variable $1 # return the cmdline-switch to add directory variable $1
@ -639,7 +647,7 @@ set_compiler_flags()
CGAL_SHARED_LIB_LDFLAGS="-lm" CGAL_SHARED_LIB_LDFLAGS="-lm"
CGAL_SHARED_LIB_CREATE="\${CGAL_CXX} -shared" CGAL_SHARED_LIB_CREATE="\${CGAL_CXX} -shared"
WINDOW_DIR="/usr/lib/X11" WINDOW_DIR="/usr/lib/X11"
RUNTIME_LINKER_FLAG= RUNTIME_LINKER_FLAG=''
;; ;;
*SunOS*5.*CC*) *SunOS*5.*CC*)
#### settings for sunpro compiler on solaris #### settings for sunpro compiler on solaris
@ -675,7 +683,7 @@ set_compiler_flags()
CGAL_SHARED_LIB_LDFLAGS="" CGAL_SHARED_LIB_LDFLAGS=""
CGAL_SHARED_LIB_CREATE="\${CGAL_CXX} -Xlinker -shared" CGAL_SHARED_LIB_CREATE="\${CGAL_CXX} -Xlinker -shared"
WINDOW_DIR="/usr/lib/X11" WINDOW_DIR="/usr/lib/X11"
RUNTIME_LINKER_FLAG= RUNTIME_LINKER_FLAG=''
;; ;;
*) *)
#### settings for unknown compiler #### settings for unknown compiler
@ -687,7 +695,7 @@ set_compiler_flags()
CGAL_SHARED_LIB_LDFLAGS="" CGAL_SHARED_LIB_LDFLAGS=""
CGAL_SHARED_LIB_CREATE="`compiler_bin` -G" CGAL_SHARED_LIB_CREATE="`compiler_bin` -G"
WINDOW_DIR="/usr/lib/X11" WINDOW_DIR="/usr/lib/X11"
RUNTIME_LINKER_FLAG= RUNTIME_LINKER_FLAG=''
;; ;;
esac esac
} }
@ -785,8 +793,10 @@ cgal_ldflags()
${_printf} \ ${_printf} \
"-L`_where_is 'CGAL_LIB_DIR'`/`full_ostype` " "-L`_where_is 'CGAL_LIB_DIR'`/`full_ostype` "
${_printf} \ ${_printf} \
"`rpath_directive 'CGAL_LIB_DIR'`/" "`rpath_directive 'CGAL_LIB_DIR'`"
${_printf} "`full_ostype` " if [ -n "${RUNTIME_LINKER_FLAG}" ]; then
${_printf} "/`full_ostype` "
fi
} }
#--------------------------------------------------------- #---------------------------------------------------------
@ -2380,6 +2390,7 @@ test_setup()
{ {
SETUP_COMPLETE='' SETUP_COMPLETE=''
make_lib_dir make_lib_dir
link_gmp
# STL # STL
if [ -z "${STL_TEST_PASSED}" ]; then if [ -z "${STL_TEST_PASSED}" ]; then
test_stl test_stl
@ -3045,6 +3056,7 @@ install_gmp()
# restore os/compiler stuff # restore os/compiler stuff
LEDA_SUPPORT="${SAVE_LEDA}" LEDA_SUPPORT="${SAVE_LEDA}"
link_gmp
} }
@ -3133,10 +3145,7 @@ write_compiler_flags()
"*** Fill in any additional compiler flags you need ***" \ "*** Fill in any additional compiler flags you need ***" \
>> ${FILE} >> ${FILE}
${_printf} \ ${_printf} \
"CUSTOM_CXXFLAGS = \\\\\n" \ "CUSTOM_CXXFLAGS = ${CUSTOM_CXXFLAGS}\n\n" \
>> ${FILE}
${_printf} \
"\t${CUSTOM_CXXFLAGS}\n\n" \
>> ${FILE} >> ${FILE}
# #
@ -3547,9 +3556,13 @@ generatemakefiles()
replace_line ${FILE} CGAL_MAKEFILE \ replace_line ${FILE} CGAL_MAKEFILE \
"CGAL_MAKEFILE = ${CGAL_MAKEFILE}" "CGAL_MAKEFILE = ${CGAL_MAKEFILE}"
FILE=${CGAL_EXAMPLE_DIR}/makefile for DIRECTORY in `/bin/ls ${CGAL_EXAMPLE_DIR}`; do
replace_line ${FILE} CGAL_MAKEFILE \ if [ -d ${DIRECTORY} ]; then
"CGAL_MAKEFILE = ${CGAL_MAKEFILE}" FILE=${CGAL_EXAMPLE_DIR}/${DIRECTORY}/makefile
replace_line ${FILE} CGAL_MAKEFILE \
"CGAL_MAKEFILE = ${CGAL_MAKEFILE}"
fi
done
if [ -n "${CGAL_TESTSUITE}" ]; then if [ -n "${CGAL_TESTSUITE}" ]; then
for FILE in `${_ls} ${CGAL_TEST_DIR}/*/makefile`; do for FILE in `${_ls} ${CGAL_TEST_DIR}/*/makefile`; do