Changeset 507

Timestamp:

Aug 26, 2005 2:33:43 PM (15 years ago)

Author:

andreasw

Message:

• corrected CXXLIBS treatment in configure script
• use \verb for \tt text that contains --
• set properties

Location:

branches/dev

Files:

• Algorithm/IpAlgorithmRegOp.cpp (modified) (1 diff, 1 prop)
• Algorithm/IpAlgorithmRegOp.hpp (modified) (1 diff, 1 prop)
• Algorithm/LinearSolvers/IpLinearSolversRegOp.cpp (modified) (1 diff, 1 prop)
• Algorithm/LinearSolvers/IpLinearSolversRegOp.hpp (modified) (1 diff, 1 prop)
• Docs/documentation.tex (modified) (6 diffs)
• Examples/hs071_c/Makefile.in (modified) (1 diff, 1 prop)
• Examples/hs071_c/hs071_c.c (modified) (1 diff, 1 prop)
• Examples/hs071_cpp/Makefile.in (modified) (1 diff, 1 prop)
• Examples/hs071_cpp/hs071_main.cpp (modified) (1 diff, 1 prop)
• Examples/hs071_cpp/hs071_nlp.cpp (modified) (1 diff, 1 prop)
• Examples/hs071_cpp/hs071_nlp.hpp (modified) (1 diff, 1 prop)
• Interfaces/IpInterfacesRegOp.cpp (modified) (1 diff, 1 prop)
• Interfaces/IpInterfacesRegOp.hpp (modified) (1 diff, 1 prop)
• Interfaces/IpSolveStatistics.cpp (modified) (1 diff, 1 prop)
• Interfaces/IpSolveStatistics.hpp (modified) (1 diff, 1 prop)
• LICENSE (modified) (1 prop)
• Windows/VisualStudio_dotNET/Ipopt/Ipopt.sln (modified) (1 prop)
• Windows/VisualStudio_dotNET/Ipopt/Ipopt.vcproj (modified) (1 prop)
• configure (modified) (1 diff)
• configure.ac (modified) (2 diffs)

branches/dev/Algorithm/IpAlgorithmRegOp.cpp

@@ -3 +3 @@
 // This code is published under the Common Public License.
 //
-// $Id: IpAlgorithmRegOp.cpp 430 2005-08-10 00:19:54Z andreasw $
+// $Id$
 //
 // Authors:  Carl Laird, Andreas Waechter     IBM    2005-08-16

branches/dev/Algorithm/IpAlgorithmRegOp.hpp

@@ -3 +3 @@
 // This code is published under the Common Public License.
 //
-// $Id: IpAlgorithmRegOp.hpp 430 2005-08-10 00:19:54Z andreasw $
+// $Id$
 //
 // Authors:  Carl Laird, Andreas Waechter     IBM    2005-08-16

branches/dev/Algorithm/LinearSolvers/IpLinearSolversRegOp.cpp

@@ -3 +3 @@
 // This code is published under the Common Public License.
 //
-// $Id: IpLinearSolversRegOp.cpp 430 2005-08-10 00:19:54Z andreasw $
+// $Id$
 //
 // Authors:  Carl Laird, Andreas Waechter     IBM    2005-08-16

branches/dev/Algorithm/LinearSolvers/IpLinearSolversRegOp.hpp

@@ -3 +3 @@
 // This code is published under the Common Public License.
 //
-// $Id: IpLinearSolversRegOp.hpp 430 2005-08-10 00:19:54Z andreasw $
+// $Id$
 //
 // Authors:  Carl Laird, Andreas Waechter     IBM    2005-08-16

branches/dev/Docs/documentation.tex

@@ -394 +394 @@
   You can change the default installation directory (here
   \texttt{\$IPOPTDIR}) to something else (such as \texttt{/usr/local})
-  by using the \texttt{--prefix} switch for \texttt{configure}.
+  by using the \verb|--prefix| switch for \texttt{configure}.
 %\item Test the installation \\
 %  {\tt \$ make test}\\
@@ -846 +846 @@
 the header files are installed in \texttt{\$IPOPTDIR/include/ipopt}
 (or in \texttt{\$PREFIX/include/ipopt} if the switch
-\texttt{--prefix=\$PREFIX} was used for {\tt configure}).
+\verb|--prefix=$PREFIX| was used for {\tt configure}).
 
 \subsubsection{Coding the Problem Representation}\label{sec.cpp_problem}
@@ -1647 +1647 @@
 \texttt{\$IPOPTDIR/include/ipopt} (or in
 \texttt{\$PREFIX/include/ipopt} if the switch
-\texttt{--prefix=\$PREFIX} was used for {\tt configure}); while
+\verb|--prefix=$PREFIX| was used for {\tt configure}); while
 reading this section, it will be helpful to have a look at this file.
 
@@ -2566 +2566 @@
 
 In general, you can see the list of options and variables that can be
-set for the {\tt configure} script by typing {\tt configure --help}.
+set for the {\tt configure} script by typing \verb/configure --help/.
 Below a few particular options are discussed:
 
@@ -2576 +2576 @@
 
   However, you can specify a BLAS library (such as your local ATLAS
-  library) explicitly, using the {\tt --with-blas} flag for {\tt
+  library) explicitly, using the \verb/--with-blas/ flag for {\tt
     configure}.  For example,
 
-  {\tt ./configure --with=blas="-L \$HOME/lib -latlas"}
+  \verb|./configure --with=blas="-L$HOME/lib -latlas"|
 
   To tell the configure script to compile and use the downloaded BLAS
   source files even if a BLAS library is found on your system, specify
-  {\tt --with-blas=BUILD}.
+  \verb|--with-blas=BUILD|.
 
 \item Similarly, if you have a precompiled library containing the
-  Harwell Subroutines, you can specify its location with the {\tt
-    --with-hsl} flag.
+  Harwell Subroutines, you can specify its location with the
+  \verb|--with-hsl| flag.
 
 \item If you want to specify that you want to use particular
@@ -2649 +2649 @@
 
 \item It is possible to compile the \Ipopt\ library in a debug
-  configuration, by specifying {\tt --enable-debug}.  Then the
+  configuration, by specifying \verb|--enable-debug|.  Then the
   compilers will use the debug flags (unless the compilation flag
   variables are overwritten in the command line), and additional debug

branches/dev/Examples/hs071_c/Makefile.in

@@ -3 +3 @@
 # This file is distributed under the Common Public License.
 
-# $Id: Makefile.in 433 2005-08-11 16:28:35Z andreasw $
+# $Id$
 
 # Directory to the sources for the (example) problem definition files

branches/dev/Examples/hs071_c/hs071_c.c

@@ -3 +3 @@
  * This code is published under the Common Public License.
  *
- * $Id: MyNLP.hpp 419 2005-08-01 18:34:28Z andreasw $
+ * $Id$
  *
  * Authors:  Carl Laird, Andreas Waechter     IBM    2005-08-17

branches/dev/Examples/hs071_cpp/Makefile.in

@@ -3 +3 @@
 # This file is distributed under the Common Public License.
 
-# $Id: Makefile.in 433 2005-08-11 16:28:35Z andreasw $
+# $Id$
 
 # Directory to the sources for the (example) problem definition files

branches/dev/Examples/hs071_cpp/hs071_main.cpp

@@ -3 +3 @@
 // This code is published under the Common Public License.
 //
-// $Id: cpp_example.cpp 419 2005-08-01 18:34:28Z andreasw $
+// $Id$
 //
 // Authors:  Carl Laird, Andreas Waechter     IBM    2005-08-10

branches/dev/Examples/hs071_cpp/hs071_nlp.cpp

@@ -3 +3 @@
 // This code is published under the Common Public License.
 //
-// $Id: MyNLP.cpp 419 2005-08-01 18:34:28Z andreasw $
+// $Id$
 //
 // Authors:  Carl Laird, Andreas Waechter     IBM    2005-08-16

branches/dev/Examples/hs071_cpp/hs071_nlp.hpp

@@ -3 +3 @@
 // This code is published under the Common Public License.
 //
-// $Id: MyNLP.hpp 419 2005-08-01 18:34:28Z andreasw $
+// $Id$
 //
 // Authors:  Carl Laird, Andreas Waechter     IBM    2005-08-09

branches/dev/Interfaces/IpInterfacesRegOp.cpp

@@ -3 +3 @@
 // This code is published under the Common Public License.
 //
-// $Id: IpInterfacesRegOp.hpp 430 2005-08-10 00:19:54Z andreasw $
+// $Id$
 //
 // Authors:  Carl Laird, Andreas Waechter     IBM    2005-08-16

branches/dev/Interfaces/IpInterfacesRegOp.hpp

@@ -3 +3 @@
 // This code is published under the Common Public License.
 //
-// $Id: IpInterfacesRegOp.hpp 430 2005-08-10 00:19:54Z andreasw $
+// $Id$
 //
 // Authors:  Carl Laird, Andreas Waechter     IBM    2005-08-16

branches/dev/Interfaces/IpSolveStatistics.cpp

@@ -3 +3 @@
 // This code is published under the Common Public License.
 //
-// $Id: IpTNLPAdapter.cpp 433 2005-08-11 16:28:35Z andreasw $
+// $Id$
 //
 // Authors:  Andreas Waechter          IBM    2005-08-15

branches/dev/Interfaces/IpSolveStatistics.hpp

@@ -3 +3 @@
 // This code is published under the Common Public License.
 //
-// $Id: IpTNLPAdapter.hpp 430 2005-08-10 00:19:54Z andreasw $
+// $Id$
 //
 // Authors:  Carl Laird, Andreas Waechter          IBM    2005-08-15

branches/dev/configure

@@ -2459 +2459 @@
 
 # C++ link libraries #
-CXXLIBS=
+
 if test -z "$CXXLIBS"; then
   if test "$GXX" = "yes"; then

branches/dev/configure.ac

@@ -6 +6 @@
 
 # Authors:  Carl Laird, Andreas Waechter     IBM    2004-08-13
-
-## SGI: ./configure CC=cc F77=f77 CXX=CC CXXFLAGS="-g -LANG:std -DOLD_C_HEADERS" AR="CC -ar" ARFLAGS="-o " AR_X="ar x" FFLAGS=-g CFLAGS=-g CXXLIBS='-lCsup -lC -lCio'
-## AIX: ./configure CC=xlc F77=xlf CXX=xlC --with-lapack=$HOME/lib/liblapack.a CFLAGS=-g FFLAGS=-g CXXFLAGS="-g -qrtti=dyna" CXXLIBS="-lC -lc"
-## HP1: configure --with-asl=$HOME/COIN/OBJhp1/OTHERS/ASL/amplsolver.a --with-blas=/opt/fortran/lib/libblas.a --with-hsl=$HOME/COIN/OBJhp1/OTHERS/HSL/libiphsl.a --with-lapack=$HOME/COIN/OBJhp1/OTHERS/lapack/libiplapack.a F77=/opt/fortran/bin/fort77 CC=/opt/ansic/bin/cc CXX=/opt/aCC/bin/aCC FFLAGS='-g' CFLAGS='-g' CXXFLAGS='-AA -DMY_C_FINITE=isfinite -g' CXXLIBS='-L/opt/aCC/lib -l++ -lstd_v2 -lCsup_v2 -lm -lcl -lc'
-# gridsun1: need AR='CC -xar' ARFLAGS='-o'
 
 AC_PREREQ(2.59)
@@ -225 +220 @@
 
 # C++ link libraries #
-AC_ARG_VAR(CXXLIBS,[Libraries necessary for linking C++ code with Fortran compiler])CXXLIBS=
+AC_ARG_VAR(CXXLIBS,[Libraries necessary for linking C++ code with Fortran compiler])
 if test -z "$CXXLIBS"; then
   if test "$GXX" = "yes"; then