Another iteration trying to fix Boost on Travis

PCMSolver · Sep 18, 2014 · 8d9b3bd · 8d9b3bd
2 parents fd3ec42 + c77e4fa
commit 8d9b3bd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -73,7 +73,7 @@ add_custom_command(
     COMMAND ./bootstrap.sh --with-toolset=${toolset}
             --with-libraries="${b2_needed_components}"
 	    --with-python=${PYTHON_EXECUTABLE}
-	    --prefix=${CUSTOM_BOOST_LOCATION} #1> boost.configured.log 2> boost.configured.err
+	    --prefix=${CUSTOM_BOOST_LOCATION} 1> boost.configured.log 2> boost.configured.err
     COMMAND touch ${PROJECT_BINARY_DIR}/external/boost.configured	    
     WORKING_DIRECTORY ${BOOST_BUILD_DIR}
     DEPENDS boost.unpacked
@@ -82,7 +82,7 @@ add_custom_command(
 # Build Boost
 add_custom_command(
     OUTPUT boost.built
-    COMMAND ./b2 --layout=versioned variant=${type} link=static threading=multi #1> boost.built.log 2> boost.built.err
+    COMMAND ./b2 variant=${type} link=static threading=multi 1> boost.built.log 2> boost.built.err
     COMMAND touch ${PROJECT_BINARY_DIR}/external/boost.built
     WORKING_DIRECTORY ${BOOST_BUILD_DIR}
     DEPENDS boost.configured 
@@ -91,9 +91,9 @@ add_custom_command(
 # Install Boost
 add_custom_command(
     OUTPUT boost.installed
-    COMMAND ./b2 install --layout=versioned
+    COMMAND ./b2 install
 	    variant=${type} link=static
-	    threading=multi # 1> boost.installed.log 2> boost.installed.err	   
+	    threading=multi 1> boost.installed.log 2> boost.installed.err	   
     COMMAND touch ${PROJECT_BINARY_DIR}/external/boost.installed
     WORKING_DIRECTORY ${BOOST_BUILD_DIR}
     DEPENDS boost.built 

diff --git a/external/boostcpp.jam b/external/boostcpp.jam
@@ -122,8 +122,7 @@ rule tag ( name : type ? : property-set )
         if $(layout) = versioned
         {
             result = [ common.format-name
-               # <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG)
-                <base> -$(BOOST_VERSION_TAG)
+                <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG)
                 -$(BUILD_ID)
                 : $(name) : $(type) : $(property-set) ] ;
         }
@@ -137,7 +136,8 @@ rule tag ( name : type ? : property-set )
         else if $(layout) = system
         {
             result = [ common.format-name
-                <base>
+                #<base>
+                <base> -$(BOOST_VERSION_TAG)
                 -$(BUILD_ID)
                 : $(name) : $(type) : $(property-set) ] ;
         }