Re: [lmi] building latest cvs with MSVC (PETE paths)

[Vaclav Slavik]

On Mon, 2008-11-17 at 02:35 +0000, Greg Chicares wrote:
> Here are changes we could make, in increasing order of awfulness.
> 
> Not awful at all: change #include lines for 'et_vector.hpp'
> in lmi files outside the PETE subdirectory. 

I like this the best -- it preserves PETE hierarchy and doesn't require
PETE installation step (that's something I want to avoid if at all
possible, the less unusual our Automake makefiles are, the better).

I may be missing something (another version of compiler, perhaps?), but
the patch below works for me on both platforms. (I made sure to remove
PETE from /opt/lmi/third_party. Also notice that the include directory
is absolute, because $(src_dir) is /opt/lmi/src/lmi; that may be why it
works.)

Vaclav

Index: Makefile.am
===================================================================
RCS file: /sources/lmi/lmi/Makefile.am,v
retrieving revision 1.62
diff -u -u -r1.62 Makefile.am
--- Makefile.am 31 Oct 2008 13:17:53 -0000      1.62
+++ Makefile.am 17 Nov 2008 17:52:04 -0000
@@ -25,6 +25,19 @@
 SUBDIRS = third_party
 
 ##############################################################################
+# Common compilation flags
+##############################################################################
+
+AM_CPPFLAGS = -I$(srcdir)/tools/pete-2.1.1
+
+# On windows use auto import feature
+if LMI_MSW
+    AM_LDFLAGS=--enable-auto-import
+else
+    AM_LDFLAGS=
+endif
+
+##############################################################################
 # All Targets
 ##############################################################################
 
@@ -126,15 +139,6 @@
 
 check_PROGRAMS = $(TESTS)
 
-####################################
-# On windows use auto import feature
-####################################
-if LMI_MSW
-    AM_LDFLAGS=--enable-auto-import
-else
-    AM_LDFLAGS=
-endif
-
 ##############################################################################
 # Targets definitions
 ##############################################################################
Index: workhorse.make
===================================================================
RCS file: /sources/lmi/lmi/workhorse.make,v
retrieving revision 1.130
diff -u -u -r1.130 workhorse.make
--- workhorse.make      3 Oct 2008 10:41:48 -0000       1.130
+++ workhorse.make      17 Nov 2008 17:52:08 -0000
@@ -276,6 +276,7 @@
 
 all_include_directories := \
   $(src_dir) \
+  $(src_dir)/tools/pete-2.1.1 \
   $(overriding_include_directories) \
   $(compiler_include_directory) \
   $(wx_include_paths) \
Index: install_miscellanea.make
===================================================================
RCS file: /sources/lmi/lmi/install_miscellanea.make,v
retrieving revision 1.14
diff -u -u -r1.14 install_miscellanea.make
--- install_miscellanea.make    11 Sep 2008 18:09:16 -0000      1.14
+++ install_miscellanea.make    17 Nov 2008 17:52:08 -0000
@@ -119,7 +119,7 @@
 # Targets 
######################################################################
 
 .PHONY: all
-all: boost cgicc fop md5sum_msw pete sample xmlwrapp
+all: boost cgicc fop md5sum_msw sample xmlwrapp
 
 # Patches were generated according to this advice:
 #
@@ -190,23 +190,6 @@
 md5sum_msw: $(file_list)
        $(CP) --preserve $(cache_dir)/$(stem) $(third_party_bin_dir)
 
-# For now at least, a locally-modified pete-2.1.1 resides in the lmi
-# repository, though eventually it might be supplied as a tarball.
-#
-# It is copied to the same directory as other third-party libraries
-# so that all follow the same usage paradigm.
-#
-# '*.*' in the $(CP) command is not an inadvertent msdos-ism.
-
-.PHONY: pete
-pete:
-       @$(MKDIR) $(third_party_include_dir)/PETE/
-       $(CP) \
-         --force --preserve --recursive \
-         --target-directory=$(third_party_include_dir)/PETE/ \
-         /opt/lmi/src/lmi/tools/pete-2.1.1/*.* \
-         /opt/lmi/src/lmi/tools/pete-2.1.1/PETE/*.* \
-
 # The 'clobber' target doesn't remove $(prefix)/data because that
 # directory might contain valuable user-customized files; hence, in
 # this case, $(MKDIR) must be allowed to fail.
Index: loads.cpp
===================================================================
RCS file: /sources/lmi/lmi/loads.cpp,v
retrieving revision 1.23
diff -u -u -r1.23 loads.cpp
--- loads.cpp   17 Sep 2008 14:23:25 -0000      1.23
+++ loads.cpp   17 Nov 2008 17:52:08 -0000
@@ -38,7 +38,7 @@
 #include "mc_enum_types_aux.hpp" // mc_n_ enumerators
 #include "rounding_rules.hpp"
 
-#include <PETE/et_vector.hpp>
+#include <et_vector.hpp>
 
 #include <algorithm>
 #include <functional>
Index: expression_template_0_test.cpp
===================================================================
RCS file: /sources/lmi/lmi/expression_template_0_test.cpp,v
retrieving revision 1.22
diff -u -u -r1.22 expression_template_0_test.cpp
--- expression_template_0_test.cpp      17 Sep 2008 02:06:28 -0000      1.22
+++ expression_template_0_test.cpp      17 Nov 2008 17:52:08 -0000
@@ -47,7 +47,7 @@
 #include "test_tools.hpp"
 #include "timer.hpp"
 
-#include <PETE/et_vector.hpp>
+#include <et_vector.hpp>
 
 #if !defined __BORLANDC__
 #   include <boost/bind.hpp>