From 0d8845bfaa47e7686551b7c6da0c042aec4c7aa6 Mon Sep 17 00:00:00 2001 From: apo Date: Thu, 1 Nov 2007 07:07:19 +0000 Subject: [PATCH] To fix a compilation problem (explicit defintion of the location of the BOOST heades & libraries) --- adm_local/unix/make_commence.in | 2 ++ src/MULTIPR/Makefile.in | 7 +++---- src/MULTIPRGUI/Makefile.in | 16 ++++++++++++---- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 9003b37..2d3f806 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -39,6 +39,8 @@ CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@ # BOOST Library BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LIBSUFFIX = @BOOST_LIBSUFFIX@ +BOOST_LIBS = @BOOST_LIBS@ # JAVA diff --git a/src/MULTIPR/Makefile.in b/src/MULTIPR/Makefile.in index 9b326c5..3a0d876 100644 --- a/src/MULTIPR/Makefile.in +++ b/src/MULTIPR/Makefile.in @@ -42,7 +42,7 @@ EXPORT_HEADERS = # additionnal information to compile and link file -CPPFLAGS += $(KERNEL_CXXFLAGS) $(MED_CXXFLAGS) $(MED2_INCLUDES) -Wall -pthread +CPPFLAGS += $(KERNEL_CXXFLAGS) $(MED_CXXFLAGS) $(MED2_INCLUDES) $(BOOST_CPPFLAGS) -Wall -pthread LDFLAGS += \ $(KERNEL_LDFLAGS) \ @@ -51,9 +51,8 @@ LDFLAGS += \ -lOpUtil \ -lTOOLSDS \ -lSALOMELocalTrace \ - $(MED2_LIBS) \ - -lmed \ - $(MED_LDFLAGS) \ + $(MED2_LIBS) $(MED_LDFLAGS) \ + $(BOOST_LIBS) -lboost_thread${BOOST_LIBSUFFIX} \ -lmedsplitter \ -lmedmem \ -lmed_V2_1 \ diff --git a/src/MULTIPRGUI/Makefile.in b/src/MULTIPRGUI/Makefile.in index 3c80ab3..926c2b0 100644 --- a/src/MULTIPRGUI/Makefile.in +++ b/src/MULTIPRGUI/Makefile.in @@ -53,10 +53,18 @@ CPPFLAGS += \ $(MED2_INCLUDES) \ $(BOOST_CPPFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) $(BOOST_CPPFLAGS) -LDFLAGS += $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) $(MED_LDFLAGS) $(MED2_LIBS) $(BOOST_LIBS) \ - -lSALOMELocalTrace -lSalomeApp -lmed -lmedsplitter -lmedmem -lmed_V2_1 \ - -lMULTIPR_API +LDFLAGS += \ + $(KERNEL_LDFLAGS) \ + $(GUI_LDFLAGS) \ + $(MED_LDFLAGS) $(MED2_LIBS) \ + $(BOOST_LIBS) -lboost_thread${BOOST_LIBSUFFIX} \ + -lSALOMELocalTrace \ + -lSalomeApp \ + -lmedsplitter \ + -lmedmem \ + -lmed_V2_1 \ + -lMULTIPR_API @CONCLUDE@ -- 2.39.2