Changeset 1620


Ignore:
Timestamp:
Nov 3, 2010 12:56:03 PM (9 years ago)
Author:
lou
Message:

Update Data externals to match 1.1 configuration.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:externals

      •  

        old new  
        22ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
        33ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
        4 #Data/Netlib   https://projects.coin-or.org/svn/Data/trunk/Netlib
        5 Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
         4#Data/Netlib   https://projects.coin-or.org/svn/Data/Netlib/trunk
         5Data/Sample   https://projects.coin-or.org/svn/Data/Sample/trunk
        66CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
        77Osi           https://projects.coin-or.org/svn/Osi/trunk/Osi

  • trunk/Dependencies

    r1615 r1620  
    22ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
    33ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
    4 #Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
    5 Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
     4#Data/Netlib   https://projects.coin-or.org/svn/Data/Netlib/trunk
     5Data/Sample   https://projects.coin-or.org/svn/Data/Sample/trunk
    66CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    77Osi     https://projects.coin-or.org/svn/Osi/trunk/Osi

  • trunk/Externals

    r1575 r1620  
    22ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
    33ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
    4 #Data/Netlib   https://projects.coin-or.org/svn/Data/trunk/Netlib
    5 Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
     4#Data/Netlib   https://projects.coin-or.org/svn/Data/Netlib/trunk
     5Data/Sample   https://projects.coin-or.org/svn/Data/Sample/trunk
    66CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    77Osi           https://projects.coin-or.org/svn/Osi/trunk/Osi

  • trunk/configure

    r1593 r1620  
    58755875full_prefix=`cd $full_prefix ; pwd`
    58765876
    5877 abs_lib_dir=$full_prefix/lib
     5877abs_lib_dir=$full_prefix/lib/coin
    58785878
    58795879abs_include_dir=$full_prefix/include
    … …  
    2074020740      if test "$GXX" = "yes"; then
    2074120741        RPATH_FLAGS=
    20742         for dir in $abs_lib_dir/coin $abs_lib_dir/coin/ThirdParty; do
     20742        for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
    2074320743          RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    2074420744        done
    … …  
    2075720757    *-*-solaris*)
    2075820758        RPATH_FLAGS=
    20759         for dir in $abs_lib_dir/coin $abs_lib_dir/coin/ThirdParty; do
     20759        for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
    2076020760          RPATH_FLAGS="$RPATH_FLAGS -R$dir"
    2076120761        done
    … …  
    2099020990# best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
    2099120991# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
    20992 COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20992if test "x${prefix}" = xNONE ; then
     20993  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20994else
     20995  COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20996fi
    2099320997
    2099420998
Note: See TracChangeset for help on using the changeset viewer.