Changeset 2244 for ThirdParty/SCIP

Timestamp:

Jun 9, 2011 1:39:30 PM (9 years ago)

Author:

stefan

Message:

proper fix for bug in setting up .pc file

Location:

ThirdParty/SCIP/trunk

Files:

• configure (modified) (25 diffs)
• configure.ac (modified) (1 diff)

ThirdParty/SCIP/trunk/configure

@@ -21301 +21301 @@
 SOPLEX_CFLAGS=
 SOPLEX_DATA=
+SOPLEX_DEPENDENCIES=
+SOPLEX_PCLIBS=
+SOPLEX_PCREQUIRES=
+SOPLEX_DATA=
 
 
@@ -21321 +21325 @@
        coin_has_soplex=yes
        SOPLEX_LIBS="$withval"
+       SOPLEX_PCLIBS="$withval"
 
        # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
@@ -21408 +21413 @@
           SOPLEX_LIBS=`echo " $SOPLEX_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
         fi
+        SOPLEX_PCREQUIRES="coinsoplex"
 
         # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in
@@ -21447 +21453 @@
 SOPLEX_DATA=
 SOPLEX_DATA_INSTALLED=
+SOPLEX_PCLIBS=
+SOPLEX_PCREQUIRES=
 
 # initial list of dependencies is "coinsoplex", but we need to filter out version number specifications (= x, <= x, >= x, != x)
@@ -21644 +21652 @@
   fi
 
+  SOPLEX_PCREQUIRES="coinsoplex"
 
 
@@ -21711 +21720 @@
 echo "$as_me: SoPlex DATA   is  $SOPLEX_DATA" >&6;}
     fi
-    if test -n "$SOPLEX_CFLAGS" ; then
-      { echo "$as_me:$LINENO: SoPlex CFLAGS are $SOPLEX_CFLAGS" >&5
-echo "$as_me: SoPlex CFLAGS are $SOPLEX_CFLAGS" >&6;}
+    if test -n "$SOPLEX_PCLIBS" ; then
+      { echo "$as_me:$LINENO: SoPlex PCLIBS are $SOPLEX_PCLIBS" >&5
+echo "$as_me: SoPlex PCLIBS are $SOPLEX_PCLIBS" >&6;}
+    fi
+    if test -n "$SOPLEX_PCREQUIRES" ; then
+      { echo "$as_me:$LINENO: SoPlex PCREQUIRES are $SOPLEX_PCREQUIRES" >&5
+echo "$as_me: SoPlex PCREQUIRES are $SOPLEX_PCREQUIRES" >&6;}
     fi
 
@@ -21762 +21775 @@
 CLP_LIBS=
 CLP_CFLAGS=
+CLP_DATA=
+CLP_DEPENDENCIES=
+CLP_PCLIBS=
+CLP_PCREQUIRES=
 CLP_DATA=
 
@@ -21783 +21800 @@
        coin_has_clp=yes
        CLP_LIBS="$withval"
+       CLP_PCLIBS="$withval"
 
        # if project flags are given by user and we build without pkg-config, then we need to setup the _INSTALLED variables
@@ -21870 +21888 @@
           CLP_LIBS=`echo " $CLP_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
         fi
+        CLP_PCREQUIRES="clp"
 
         # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in
@@ -21909 +21928 @@
 CLP_DATA=
 CLP_DATA_INSTALLED=
+CLP_PCLIBS=
+CLP_PCREQUIRES=
 
 # initial list of dependencies is "clp", but we need to filter out version number specifications (= x, <= x, >= x, != x)
@@ -22106 +22127 @@
   fi
 
+  CLP_PCREQUIRES="clp"
 
 
@@ -22173 +22195 @@
 echo "$as_me: Clp DATA   is  $CLP_DATA" >&6;}
     fi
-    if test -n "$CLP_CFLAGS" ; then
-      { echo "$as_me:$LINENO: Clp CFLAGS are $CLP_CFLAGS" >&5
-echo "$as_me: Clp CFLAGS are $CLP_CFLAGS" >&6;}
+    if test -n "$CLP_PCLIBS" ; then
+      { echo "$as_me:$LINENO: Clp PCLIBS are $CLP_PCLIBS" >&5
+echo "$as_me: Clp PCLIBS are $CLP_PCLIBS" >&6;}
+    fi
+    if test -n "$CLP_PCREQUIRES" ; then
+      { echo "$as_me:$LINENO: Clp PCREQUIRES are $CLP_PCREQUIRES" >&5
+echo "$as_me: Clp PCREQUIRES are $CLP_PCREQUIRES" >&6;}
     fi
 
@@ -23152 +23178 @@
     SCIPLIB_LIBS_INSTALLED="$SCIPLIB_LIBS $SOPLEX_LIBS_INSTALLED"
     SCIPLIB_PCLIBS="$SCIPLIB_PCLIBS $SOPLEX_PCLIBS"
-    SCIPLIB_PCREQUIRES="coinsoplex $SOPLEX_PCREQUIRES"
+    SCIPLIB_PCREQUIRES="$SCIPLIB_PCREQUIRES $SOPLEX_PCREQUIRES"
   ;;
   clp)
@@ -23343 +23369 @@
 IPOPT_CFLAGS=
 IPOPT_DATA=
+IPOPT_DEPENDENCIES=
+IPOPT_PCLIBS=
+IPOPT_PCREQUIRES=
+IPOPT_DATA=
 
 
@@ -23371 +23401 @@
        coin_has_ipopt=yes
        IPOPT_LIBS="$withval"
+       IPOPT_PCLIBS="$withval"
 
          SCIPLIB_PCLIBS="$withval $SCIPLIB_PCLIBS"
@@ -23461 +23492 @@
           IPOPT_LIBS=`echo " $IPOPT_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
         fi
+        IPOPT_PCREQUIRES="ipopt != 3.9trunk"
 
         # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in SCIPLib
@@ -23504 +23536 @@
 IPOPT_DATA=
 IPOPT_DATA_INSTALLED=
+IPOPT_PCLIBS=
+IPOPT_PCREQUIRES=
 
 # initial list of dependencies is "ipopt != 3.9trunk", but we need to filter out version number specifications (= x, <= x, >= x, != x)
@@ -23701 +23735 @@
   fi
 
+  IPOPT_PCREQUIRES="ipopt != 3.9trunk"
 
     SCIPLIB_PCREQUIRES="ipopt != 3.9trunk $SCIPLIB_PCREQUIRES"
@@ -23776 +23811 @@
 echo "$as_me: Ipopt DATA   is  $IPOPT_DATA" >&6;}
     fi
-    if test -n "$IPOPT_CFLAGS" ; then
-      { echo "$as_me:$LINENO: Ipopt CFLAGS are $IPOPT_CFLAGS" >&5
-echo "$as_me: Ipopt CFLAGS are $IPOPT_CFLAGS" >&6;}
+    if test -n "$IPOPT_PCLIBS" ; then
+      { echo "$as_me:$LINENO: Ipopt PCLIBS are $IPOPT_PCLIBS" >&5
+echo "$as_me: Ipopt PCLIBS are $IPOPT_PCLIBS" >&6;}
+    fi
+    if test -n "$IPOPT_PCREQUIRES" ; then
+      { echo "$as_me:$LINENO: Ipopt PCREQUIRES are $IPOPT_PCREQUIRES" >&5
+echo "$as_me: Ipopt PCREQUIRES are $IPOPT_PCREQUIRES" >&6;}
     fi
 
@@ -23836 +23875 @@
 CPPAD_LIBS=
 CPPAD_CFLAGS=
+CPPAD_DATA=
+CPPAD_DEPENDENCIES=
+CPPAD_PCLIBS=
+CPPAD_PCREQUIRES=
 CPPAD_DATA=
 
@@ -23865 +23908 @@
        coin_has_cppad=yes
        CPPAD_LIBS="$withval"
+       CPPAD_PCLIBS="$withval"
 
          SCIPLIB_PCLIBS="$withval $SCIPLIB_PCLIBS"
@@ -23955 +23999 @@
           CPPAD_LIBS=`echo " $CPPAD_LIBS " | sed -e 's/ \(\/[^ ]*\/\)\([^ ]*\)\.lib / \`$(CYGPATH_W) \1 | sed -e "s|\\\\\\\\\\\\\\\\\\\\|\/|g"\`\2.lib /g'`
         fi
+        CPPAD_PCREQUIRES="cppad"
 
         # augment X_PCREQUIRES, X_CFLAGS, and X_LIBS for each build target X in SCIPLib
@@ -23998 +24043 @@
 CPPAD_DATA=
 CPPAD_DATA_INSTALLED=
+CPPAD_PCLIBS=
+CPPAD_PCREQUIRES=
 
 # initial list of dependencies is "cppad", but we need to filter out version number specifications (= x, <= x, >= x, != x)
@@ -24195 +24242 @@
   fi
 
+  CPPAD_PCREQUIRES="cppad"
 
     SCIPLIB_PCREQUIRES="cppad $SCIPLIB_PCREQUIRES"
@@ -24270 +24318 @@
 echo "$as_me: CppAD DATA   is  $CPPAD_DATA" >&6;}
     fi
-    if test -n "$CPPAD_CFLAGS" ; then
-      { echo "$as_me:$LINENO: CppAD CFLAGS are $CPPAD_CFLAGS" >&5
-echo "$as_me: CppAD CFLAGS are $CPPAD_CFLAGS" >&6;}
+    if test -n "$CPPAD_PCLIBS" ; then
+      { echo "$as_me:$LINENO: CppAD PCLIBS are $CPPAD_PCLIBS" >&5
+echo "$as_me: CppAD PCLIBS are $CPPAD_PCLIBS" >&6;}
+    fi
+    if test -n "$CPPAD_PCREQUIRES" ; then
+      { echo "$as_me:$LINENO: CppAD PCREQUIRES are $CPPAD_PCREQUIRES" >&5
+echo "$as_me: CppAD PCREQUIRES are $CPPAD_PCREQUIRES" >&6;}
     fi
 

ThirdParty/SCIP/trunk/configure.ac

@@ -113 +113 @@
     SCIPLIB_LIBS_INSTALLED="$SCIPLIB_LIBS $SOPLEX_LIBS_INSTALLED"
     SCIPLIB_PCLIBS="$SCIPLIB_PCLIBS $SOPLEX_PCLIBS"
-    SCIPLIB_PCREQUIRES="coinsoplex $SOPLEX_PCREQUIRES"
+    SCIPLIB_PCREQUIRES="$SCIPLIB_PCREQUIRES $SOPLEX_PCREQUIRES"
   ;;
   clp)