]> SALOME platform Git repositories - modules/multipr.git/commitdiff
Salome HOME
To fix a compilation problem (explicit defintion of the location of the BOOST heades...
authorapo <apo@opencascade.com>
Thu, 1 Nov 2007 07:07:19 +0000 (07:07 +0000)
committerapo <apo@opencascade.com>
Thu, 1 Nov 2007 07:07:19 +0000 (07:07 +0000)
adm_local/unix/make_commence.in
src/MULTIPR/Makefile.in
src/MULTIPRGUI/Makefile.in

index 9003b3799978e75f29696ea13f3de8f0e821ef1c..2d3f80699deea594eaa1315bba9b015805d68675 100644 (file)
@@ -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
 
index 9b326c5fb06fa99bf47c8839769c7e094d3b4eda..3a0d876f28703cae20ac035e6687428f7b98c794 100644 (file)
@@ -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 \
index 3c80ab3fb1d160853d96101b9fb2b7da66f7d1ad..926c2b0838870356140ebcaaf2258de2cb3ccbf1 100644 (file)
@@ -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@