Ignore:
Timestamp:
Jun 5, 2010 3:42:36 PM (10 years ago)
Author:
stefan
Message:

merge split branch into trunk

Location:
trunk
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.6
        2 ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        3 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        4 Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
        5 Data/Sample   https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        6 CoinUtils     https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        7 
         1BuildTools    https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         3ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         4#Data/Netlib   https://projects.coin-or.org/svn/Data/trunk/Netlib
         5Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
         6CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 1522,​1527-1531,​1542-1550,​1558
  • trunk/Clp/clp-uninstalled.pc.in

    r1522 r1559  
    11prefix=@prefix@
    22libdir=@ABSBUILDDIR@/src
    3 includedir=@abs_source_dir@/src
    43
    54Name: CLP
     
    76Version: @PACKAGE_VERSION@
    87Libs: -L${libdir} -lClp @ADDLIBS@
    9 Cflags: -I${includedir} -I@ABSBUILDDIR@/inc
     8Cflags: -I@abs_source_dir@/src -I@ABSBUILDDIR@/inc
    109Requires: @REQUIREDPACKAGES@
Note: See TracChangeset for help on using the changeset viewer.