- Timestamp:
- Dec 4, 2010 2:32:08 PM (10 years ago)
- Location:
- trunk/Clp
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/configure
r1644 r1645 20822 20822 if test "$CYGPATH_W" != "echo" ; then 20823 20823 # need to put into brackets since otherwise autoconf replaces the brackets in the sed command 20824 20825 20824 cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 20825 fi 20826 20826 COINUTILS_CFLAGS="$cflags" 20827 20827 COINUTILS_LIBS=`$PKG_CONFIG --libs "coinutils" 2>/dev/null` … … 20941 20941 pcifilemod=`sed -e '/[a-zA-Z]:/d' -e 's/datadir=\(.*\)/echo projdatadir=\\\\"\1\\\\"/g' $pcifile` 20942 20942 eval `sh -c "$pcifilemod"` 20943 if test "${CYGPATH_W}" != "echo"; then 20944 projdatadir="\`\$(CYGPATH_W) ${projdatadir} | sed -e 's/\\\\\\\\/\\\\\\\\\\\\\\\\/g'\`" 20945 fi 20943 20946 COINUTILS_DATA_INSTALLED="$projdatadir" 20944 20947 fi … … 20984 20987 20985 20988 # add CYGPATH_W cludge into include flags and set CFLAGS variable 20986 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 20989 if test "${CYGPATH_W}" != "echo"; then 20990 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 20991 fi 20987 20992 COINUTILS_CFLAGS="$projcflags $COINUTILS_CFLAGS" 20988 20993 … … 21025 21030 21026 21031 # add CYGPATH_W cludge into include flags and set CFLAGS variable 21027 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 21032 if test "${CYGPATH_W}" != "echo"; then 21033 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 21034 fi 21028 21035 COINUTILS_CFLAGS_INSTALLED="$projcflags $COINUTILS_CFLAGS_INSTALLED" 21029 21036 … … 21047 21054 _ACEOF 21048 21055 21056 21057 # adjust linker flags for (i)cl compiler 21058 if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ; 21059 then 21060 COINUTILS_LIBS_INSTALLED=`echo " $COINUTILS_LIBS_INSTALLED" | sed -e 's/ -L\([^ ]*\)/ \/libpath:\`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g'` 21061 fi 21049 21062 21050 21063 … … 21236 21249 if test "$CYGPATH_W" != "echo" ; then 21237 21250 # need to put into brackets since otherwise autoconf replaces the brackets in the sed command 21238 21239 21251 cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 21252 fi 21240 21253 OSI_CFLAGS="$cflags" 21241 21254 OSI_LIBS=`$PKG_CONFIG --libs "osi" 2>/dev/null` … … 21355 21368 pcifilemod=`sed -e '/[a-zA-Z]:/d' -e 's/datadir=\(.*\)/echo projdatadir=\\\\"\1\\\\"/g' $pcifile` 21356 21369 eval `sh -c "$pcifilemod"` 21370 if test "${CYGPATH_W}" != "echo"; then 21371 projdatadir="\`\$(CYGPATH_W) ${projdatadir} | sed -e 's/\\\\\\\\/\\\\\\\\\\\\\\\\/g'\`" 21372 fi 21357 21373 OSI_DATA_INSTALLED="$projdatadir" 21358 21374 fi … … 21398 21414 21399 21415 # add CYGPATH_W cludge into include flags and set CFLAGS variable 21400 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 21416 if test "${CYGPATH_W}" != "echo"; then 21417 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 21418 fi 21401 21419 OSI_CFLAGS="$projcflags $OSI_CFLAGS" 21402 21420 … … 21439 21457 21440 21458 # add CYGPATH_W cludge into include flags and set CFLAGS variable 21441 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 21459 if test "${CYGPATH_W}" != "echo"; then 21460 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 21461 fi 21442 21462 OSI_CFLAGS_INSTALLED="$projcflags $OSI_CFLAGS_INSTALLED" 21443 21463 … … 21461 21481 _ACEOF 21462 21482 21483 21484 # adjust linker flags for (i)cl compiler 21485 if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ; 21486 then 21487 OSI_LIBS_INSTALLED=`echo " $OSI_LIBS_INSTALLED" | sed -e 's/ -L\([^ ]*\)/ \/libpath:\`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g'` 21488 fi 21463 21489 21464 21490 … … 21633 21659 if test "$CYGPATH_W" != "echo" ; then 21634 21660 # need to put into brackets since otherwise autoconf replaces the brackets in the sed command 21635 21636 21661 cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 21662 fi 21637 21663 OSITESTS_CFLAGS="$cflags" 21638 21664 OSITESTS_LIBS=`$PKG_CONFIG --libs "osi-unittests" 2>/dev/null` … … 21748 21774 pcifilemod=`sed -e '/[a-zA-Z]:/d' -e 's/datadir=\(.*\)/echo projdatadir=\\\\"\1\\\\"/g' $pcifile` 21749 21775 eval `sh -c "$pcifilemod"` 21776 if test "${CYGPATH_W}" != "echo"; then 21777 projdatadir="\`\$(CYGPATH_W) ${projdatadir} | sed -e 's/\\\\\\\\/\\\\\\\\\\\\\\\\/g'\`" 21778 fi 21750 21779 OSITESTS_DATA_INSTALLED="$projdatadir" 21751 21780 fi … … 21791 21820 21792 21821 # add CYGPATH_W cludge into include flags and set CFLAGS variable 21793 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 21822 if test "${CYGPATH_W}" != "echo"; then 21823 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 21824 fi 21794 21825 OSITESTS_CFLAGS="$projcflags $OSITESTS_CFLAGS" 21795 21826 … … 21832 21863 21833 21864 # add CYGPATH_W cludge into include flags and set CFLAGS variable 21834 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 21865 if test "${CYGPATH_W}" != "echo"; then 21866 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 21867 fi 21835 21868 OSITESTS_CFLAGS_INSTALLED="$projcflags $OSITESTS_CFLAGS_INSTALLED" 21836 21869 … … 21854 21887 _ACEOF 21855 21888 21889 21890 # adjust linker flags for (i)cl compiler 21891 if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ; 21892 then 21893 OSITESTS_LIBS_INSTALLED=`echo " $OSITESTS_LIBS_INSTALLED" | sed -e 's/ -L\([^ ]*\)/ \/libpath:\`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g'` 21894 fi 21856 21895 21857 21896 … … 22011 22050 if test "$CYGPATH_W" != "echo" ; then 22012 22051 # need to put into brackets since otherwise autoconf replaces the brackets in the sed command 22013 22014 22052 cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 22053 fi 22015 22054 SAMPLE_CFLAGS="$cflags" 22016 22055 SAMPLE_LIBS=`$PKG_CONFIG --libs "coindatasample" 2>/dev/null` … … 22126 22165 pcifilemod=`sed -e '/[a-zA-Z]:/d' -e 's/datadir=\(.*\)/echo projdatadir=\\\\"\1\\\\"/g' $pcifile` 22127 22166 eval `sh -c "$pcifilemod"` 22167 if test "${CYGPATH_W}" != "echo"; then 22168 projdatadir="\`\$(CYGPATH_W) ${projdatadir} | sed -e 's/\\\\\\\\/\\\\\\\\\\\\\\\\/g'\`" 22169 fi 22128 22170 SAMPLE_DATA_INSTALLED="$projdatadir" 22129 22171 fi … … 22169 22211 22170 22212 # add CYGPATH_W cludge into include flags and set CFLAGS variable 22171 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 22213 if test "${CYGPATH_W}" != "echo"; then 22214 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 22215 fi 22172 22216 SAMPLE_CFLAGS="$projcflags $SAMPLE_CFLAGS" 22173 22217 … … 22210 22254 22211 22255 # add CYGPATH_W cludge into include flags and set CFLAGS variable 22212 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 22256 if test "${CYGPATH_W}" != "echo"; then 22257 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 22258 fi 22213 22259 SAMPLE_CFLAGS_INSTALLED="$projcflags $SAMPLE_CFLAGS_INSTALLED" 22214 22260 … … 22232 22278 _ACEOF 22233 22279 22280 22281 # adjust linker flags for (i)cl compiler 22282 if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ; 22283 then 22284 SAMPLE_LIBS_INSTALLED=`echo " $SAMPLE_LIBS_INSTALLED" | sed -e 's/ -L\([^ ]*\)/ \/libpath:\`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g'` 22285 fi 22234 22286 22235 22287 … … 22389 22441 if test "$CYGPATH_W" != "echo" ; then 22390 22442 # need to put into brackets since otherwise autoconf replaces the brackets in the sed command 22391 22392 22443 cflags=`echo $cflags | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 22444 fi 22393 22445 NETLIB_CFLAGS="$cflags" 22394 22446 NETLIB_LIBS=`$PKG_CONFIG --libs "coindatanetlib" 2>/dev/null` … … 22504 22556 pcifilemod=`sed -e '/[a-zA-Z]:/d' -e 's/datadir=\(.*\)/echo projdatadir=\\\\"\1\\\\"/g' $pcifile` 22505 22557 eval `sh -c "$pcifilemod"` 22558 if test "${CYGPATH_W}" != "echo"; then 22559 projdatadir="\`\$(CYGPATH_W) ${projdatadir} | sed -e 's/\\\\\\\\/\\\\\\\\\\\\\\\\/g'\`" 22560 fi 22506 22561 NETLIB_DATA_INSTALLED="$projdatadir" 22507 22562 fi … … 22547 22602 22548 22603 # add CYGPATH_W cludge into include flags and set CFLAGS variable 22549 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 22604 if test "${CYGPATH_W}" != "echo"; then 22605 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 22606 fi 22550 22607 NETLIB_CFLAGS="$projcflags $NETLIB_CFLAGS" 22551 22608 … … 22588 22645 22589 22646 # add CYGPATH_W cludge into include flags and set CFLAGS variable 22590 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 22647 if test "${CYGPATH_W}" != "echo"; then 22648 projcflags=`echo "$projcflags" | sed -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/g'` 22649 fi 22591 22650 NETLIB_CFLAGS_INSTALLED="$projcflags $NETLIB_CFLAGS_INSTALLED" 22592 22651 … … 22610 22669 _ACEOF 22611 22670 22671 22672 # adjust linker flags for (i)cl compiler 22673 if test x$coin_cxx_is_cl = xtrue || test x$coin_cc_is_cl = xtrue ; 22674 then 22675 NETLIB_LIBS_INSTALLED=`echo " $NETLIB_LIBS_INSTALLED" | sed -e 's/ -L\([^ ]*\)/ \/libpath:\`$(CYGPATH_W) \1\`/g' -e 's/ -l\([^ ]*\)/ lib\1.lib/g'` 22676 fi 22612 22677 22613 22678 -
trunk/Clp/examples/Makefile.in
r1637 r1645 38 38 ########################################################################## 39 39 40 COIN_HAS_PKGCONFIG = @COIN_HAS_PKGCONFIG_TRUE@TRUE 41 COIN_CXX_IS_CL = @COIN_CXX_IS_CL_TRUE@TRUE 42 COIN_HAS_SAMPLE = @COIN_HAS_SAMPLE_TRUE@TRUE 43 COIN_HAS_NETLIB = @COIN_HAS_NETLIB_TRUE@TRUE 44 40 45 # C++ Compiler command 41 46 CXX = @CXX@ … … 43 48 # C++ Compiler options 44 49 CXXFLAGS = @CXXFLAGS@ 45 @COIN_HAS_SAMPLE_TRUE@CXXFLAGS += -DSAMPLEDIR=\"@SAMPLE_DATA@\"46 @COIN_HAS_NETLIB_TRUE@CXXFLAGS += -DNETLIBDIR=\"@NETLIB_DATA@\"47 50 48 51 # additional C++ Compiler options for linking … … 54 57 # C Compiler options 55 58 CFLAGS = @CFLAGS@ 56 @COIN_HAS_SAMPLE_TRUE@CFLAGS += -DSAMPLEDIR=\"@SAMPLE_DATA@\"57 @COIN_HAS_NETLIB_TRUE@CFLAGS += -DNETLIBDIR=\"@NETLIB_DATA@\"58 59 59 # Compiler flags (we use the CYGPATH_W variables to allow compilation with Windows compilers) 60 @COIN_HAS_PKGCONFIG_TRUE@INCL = `PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --cflags clp` $(ADDINCFLAGS) 61 @COIN_HAS_PKGCONFIG_FALSE@INCL = @CLPLIB_CFLAGS_INSTALLED@ $(ADDINCFLAGS) 60 # Sample data directory 61 ifeq ($(COIN_HAS_SAMPLE), TRUE) 62 ifeq ($(COIN_HAS_PKGCONFIG), TRUE) 63 CXXFLAGS += -DSAMPLEDIR=\"`PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --variable=datadir coindatasample`\" 64 CFLAGS += -DSAMPLEDIR=\"`PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --variable=datadir coindatasample`\" 65 else 66 CXXFLAGS += -DSAMPLEDIR=\"@SAMPLE_DATA_INSTALLED@\" 67 CFLAGS += -DSAMPLEDIR=\"@SAMPLE_DATA_INSTALLED@\" 68 endif 69 endif 70 71 ifeq ($(COIN_HAS_NETLIB), TRUE) 72 ifeq ($(COIN_HAS_PKGCONFIG), TRUE) 73 CXXFLAGS += -DNETLIBDIR=\"`PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --variable=datadir coindatanetlib`\" 74 CFLAGS += -DNETLIBDIR=\"`PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --variable=datadir coindatanetlib`\" 75 else 76 CXXFLAGS += -DNETLIBDIR=\"@NETLIB_DATA_INSTALLED@\" 77 CFLAGS += -DNETLIBDIR=\"@NETLIB_DATA_INSTALLED@\" 78 endif 79 endif 80 81 # Include directories (we use the CYGPATH_W variables to allow compilation with Windows compilers) 82 ifeq ($(COIN_HAS_PKGCONFIG), TRUE) 83 INCL = `PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --cflags clp` 84 else 85 INCL = @CLPLIB_CFLAGS_INSTALLED@ 86 endif 87 INCL += $(ADDINCFLAGS) 62 88 63 89 # Linker flags 64 @COIN_HAS_PKGCONFIG_TRUE@@COIN_CXX_IS_CL_FALSE@LIBS = `PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --libs clp` 65 @COIN_HAS_PKGCONFIG_TRUE@@COIN_CXX_IS_CL_TRUE@LIBS = /link: `PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --msvc-syntax --libs clp` 66 @COIN_HAS_PKGCONFIG_FALSE@LIBS = -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ 90 ifeq ($(COIN_HAS_PKGCONFIG), TRUE) 91 LIBS = `PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ @PKG_CONFIG@ --libs clp` 92 else 93 ifeq ($(COIN_CXX_IS_CL), TRUE) 94 LIBS = /link /libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@ 95 else 96 LIBS = -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ 97 endif 98 endif 67 99 68 100 # The following is necessary under cygwin, if native compilers are used
Note: See TracChangeset
for help on using the changeset viewer.