Changeset 113


Ignore:
Timestamp:
Jul 19, 2010 10:22:56 AM (10 years ago)
Author:
kulshres
Message:

Squashed merge of branch 'master' of 'gitclone' into svn

  • 'master' of 'gitclone': (2 commits) document the install and search directory structure Colpack may be built for biarch compilation too.

details of the commits:

commit 859b1765d1d5c53eedca8cfd3566e66a00e25fca
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Mon Jul 19 16:14:25 2010 +0200

document the install and search directory structure

the library install and search paths are {lib,lib64} depending on the
compiler. 32-bit builds will use lib and 64 bit builds will use lib64.

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit 1bb08fe936c9bbcab2d776690944552e2ce50f80
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Mon Jul 19 16:03:08 2010 +0200

Colpack may be built for biarch compilation too.

include for headers
lib for 32bit library
lib64 for 64bit library

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/ADOL-C/doc/adolc-manual.tex

    r109 r113  
    33683368\verb=</SOMEPATH/ADOL-C-2.1.0>= will compile the static and the dynamic
    33693369ADOL-C library with default options and install the package (libraries
    3370 and headers) into the default installation directory {\tt \verb=<=\$HOME/adolc\_base\verb=>=}.
     3370and headers) into the default installation directory {\tt
     3371  \verb=<=\$HOME/adolc\_base\verb=>=}. Inside the install directory
     3372the subdirectory \verb=include= will contain all the installed header
     3373files that may be included by the user program, the subdirectory
     3374\verb=lib= will contain the 32-bit compiled library
     3375and the subdirectory \verb=lib64= will contain the 64-bit compiled
     3376library. Depending on the compiler only one of \verb=lib= or
     3377\verb=lib64= may be created.
    33713378
    33723379Before doing so the user may modify the header file \verb=usrparms.h=
     
    33923399In case the library and its headers are installed in a nonstandard path
    33933400this may be specified with the \verb?--with-colpack=PATH? option.
     3401It is assumed that the library and its header files have the following
     3402directory structure: \verb?PATH/include? contains all the header
     3403files,
     3404\verb?PATH/lib? contains the 32-bit compiled library and
     3405\verb?PATH/lib64? contains the 64-bit compiled library. Depending on
     3406the compiler used to compile {\sf ADOL-C} one of these libraries will
     3407be used for linking.
     3408 
    33943409%Then it is assumed that the ColPack library
    33953410%available at
  • trunk/configure

    r112 r113  
    1590015900
    1590115901COLPACK_CFLAGS="-I$colpack/include"
    15902 COLPACK_LIBS="-L$colpack/lib -lColPack -Wl,-rpath,$colpack/lib"
     15902COLPACK_LIBS="-L$colpack/${_lib} -lColPack -Wl,-rpath,$colpack/${_lib}"
    1590315903save_CFLAGS="$CFLAGS"
    1590415904save_LDFLAGS="$LDFLAGS"
  • trunk/configure.ac

    r111 r113  
    153153                [colpack=${PWD}/ThirdParty/ColPack])
    154154COLPACK_CFLAGS="-I$colpack/include"
    155 COLPACK_LIBS="-L$colpack/lib -lColPack -Wl,-rpath,$colpack/lib"
     155COLPACK_LIBS="-L$colpack/${_lib} -lColPack -Wl,-rpath,$colpack/${_lib}"
    156156save_CFLAGS="$CFLAGS"
    157157save_LDFLAGS="$LDFLAGS"
Note: See TracChangeset for help on using the changeset viewer.