Subject: [Boost-commit] svn:boost r66265 - in sandbox/chrono/libs/chrono: build test
From: vicente.botet_at_[hidden]
Date: 2010-10-30 08:19:32
Author: viboes
Date: 2010-10-30 08:19:30 EDT (Sat, 30 Oct 2010)
New Revision: 66265
URL: http://svn.boost.org/trac/boost/changeset/66265
Log:
Chrono: Update Jamfiles to be coherent with header only Boost.System
Text files modified:
sandbox/chrono/libs/chrono/build/Jamfile.v2 | 3 +
sandbox/chrono/libs/chrono/test/Jamfile.v2 | 69 ++++++++++++++++++++++++++++++---------
2 files changed, 54 insertions(+), 18 deletions(-)
Modified: sandbox/chrono/libs/chrono/build/Jamfile.v2
==============================================================================
--- sandbox/chrono/libs/chrono/build/Jamfile.v2 (original)
+++ sandbox/chrono/libs/chrono/build/Jamfile.v2 2010-10-30 08:19:30 EDT (Sat, 30 Oct 2010)
@@ -25,7 +25,7 @@
# uncomment the line above if you build outside the Boost release
#<include>../../..
<library>/boost/system//boost_system
- #<define>BOOST_CHRONO_INLINED
+ #<define>BOOST_SYSTEM_INLINED
<define>BOOST_USE_WINDOWS_H
#<define>BOOST_COMMON_TYPE_USES_STATIC_ASSERT
#<define>BOOST_RATIO_USES_STATIC_ASSERT
@@ -47,6 +47,7 @@
: usage-requirements # pass these requirement to dependents (i.e. users)
#<os>LINUX:<threading>multi
<library>/boost/system//boost_system
+ #<define>BOOST_SYSTEM_INLINED
#<define>BOOST_COMMON_TYPE_USES_STATIC_ASSERT
#<define>BOOST_RATIO_USES_STATIC_ASSERT
#<define>BOOST_CHRONO_USES_STATIC_ASSERT
Modified: sandbox/chrono/libs/chrono/test/Jamfile.v2
==============================================================================
--- sandbox/chrono/libs/chrono/test/Jamfile.v2 (original)
+++ sandbox/chrono/libs/chrono/test/Jamfile.v2 2010-10-30 08:19:30 EDT (Sat, 30 Oct 2010)
@@ -27,7 +27,8 @@
project
: requirements
<os>LINUX:<threading>multi
- <library>/boost/system//boost_system
+ #<library>/boost/system//boost_system
+ #<define>BOOST_SYSTEM_INLINED
# uncomment the line above if you build outside the Boost release
#<include>$(BOOST_ROOT)
@@ -49,16 +50,28 @@
{
return
[ run $(sources) ../build//boost_chrono
- : : : <define>BOOST_USE_WINDOWS_H
- : $(sources[1]:B)_shared ]
+ : :
+ : <define>BOOST_USE_WINDOWS_H
+ <library>/boost/system//boost_system
+ : $(sources[1]:B)_shared ]
[ run $(sources) ../build//boost_chrono/<link>static
- : : :
- : $(sources[1]:B)_static ]
+ : :
+ : <library>/boost/system//boost_system
+ : $(sources[1]:B)_static ]
[ run $(sources)
- : : : <define>BOOST_CHRONO_INLINED
- : $(sources[1]:B)_header ]
+ : :
+ : <define>BOOST_CHRONO_INLINED
+ # comment one of the following lines
+ <define>BOOST_SYSTEM_INLINED
+ #<library>/boost/system//boost_system
+ : $(sources[1]:B)_header ]
[ run $(sources)
- : : : <define>BOOST_CHRONO_INLINED <define>BOOST_USE_WINDOWS_H
+ : :
+ : <define>BOOST_CHRONO_INLINED
+ <define>BOOST_USE_WINDOWS_H
+ # comment one of the following lines
+ <define>BOOST_SYSTEM_INLINED
+ #<library>/boost/system//boost_system
: $(sources[1]:B)_header_win ]
;
}
@@ -66,16 +79,28 @@
{
return
[ run $(sources) ../build//boost_chrono
- : : : <define>BOOST_USE_WINDOWS_H
- : $(name)_shared ]
+ : :
+ : <define>BOOST_USE_WINDOWS_H
+ <library>/boost/system//boost_system
+ : $(name)_shared ]
[ run $(sources) ../build//boost_chrono/<link>static
- : : :
+ : :
+ : <library>/boost/system//boost_system
: $(name)_static ]
[ run $(sources)
- : : : <define>BOOST_CHRONO_INLINED
+ : :
+ : <define>BOOST_CHRONO_INLINED
+ # comment one of the following lines
+ <define>BOOST_SYSTEM_INLINED
+ #<library>/boost/system//boost_system
: $(name)_header ]
[ run $(sources)
- : : : <define>BOOST_CHRONO_INLINED <define>BOOST_USE_WINDOWS_H
+ : :
+ : <define>BOOST_CHRONO_INLINED
+ <define>BOOST_USE_WINDOWS_H
+ # comment one of the following lines
+ <define>BOOST_SYSTEM_INLINED
+ #<library>/boost/system//boost_system
: $(name)_header_win ]
;
}
@@ -84,13 +109,18 @@
{
return
[ compile $(sources)
- :
+ :
: $(sources[1]:B)_lib ]
[ compile $(sources)
- : <define>BOOST_CHRONO_INLINED
+ : <define>BOOST_CHRONO_INLINED
+ # comment the following line
+ <define>BOOST_SYSTEM_INLINED
: $(sources[1]:B)_header ]
[ compile $(sources)
- : <define>BOOST_CHRONO_INLINED <define>BOOST_USE_WINDOWS_H
+ : <define>BOOST_CHRONO_INLINED
+ <define>BOOST_USE_WINDOWS_H
+ # comment the following line
+ <define>BOOST_SYSTEM_INLINED
: $(sources[1]:B)_header_win ]
;
}
@@ -103,9 +133,14 @@
: $(name)_lib ]
[ compile $(sources)
: <define>BOOST_CHRONO_INLINED
+ # comment the following line
+ <define>BOOST_SYSTEM_INLINED
: $(name)_header ]
[ compile $(sources)
- : <define>BOOST_CHRONO_INLINED <define>BOOST_USE_WINDOWS_H
+ : <define>BOOST_CHRONO_INLINED
+ <define>BOOST_USE_WINDOWS_H
+ # comment the following line
+ <define>BOOST_SYSTEM_INLINED
: $(name)_header_win ]
;
}