Skip to content

Commit

Permalink
Merge branch 'modular' of https://github.com/grafikrobot/boostorg.timer
Browse files Browse the repository at this point in the history
… into feature/modular-b2
  • Loading branch information
pdimov committed Aug 28, 2024
2 parents 0c39544 + bba34d1 commit e639810
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 10 deletions.
24 changes: 24 additions & 0 deletions build.jam
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Copyright René Ferdinand Rivera Morell 2023-2024
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)

require-b2 5.2 ;

constant boost_dependencies :
/boost/config//boost_config ;

project /boost/timer
: common-requirements
<include>include
;

explicit
[ alias boost_timer : build//boost_timer ]
[ alias all : boost_timer build test ]
;

call-if : boost-library timer
: install boost_timer
;

14 changes: 10 additions & 4 deletions build/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,17 @@

# See library home page at http://www.boost.org/libs/timer

project boost/timer ;

SOURCES = auto_timers_construction cpu_timer ;

constant boost_dependencies_private :
/boost/io//boost_io
/boost/predef//boost_predef
;

project
: common-requirements <library>$(boost_dependencies)
: requirements <library>$(boost_dependencies_private) ;

lib boost_timer
: ../src/$(SOURCES).cpp
: # requirements
Expand All @@ -20,6 +27,5 @@ lib boost_timer
: # usage-requirements
<link>shared:<define>BOOST_TIMER_DYN_LINK=1
<link>static:<define>BOOST_TIMER_STATIC_LINK=1
<define>BOOST_TIMER_NO_LIB=1
;

boost-install boost_timer ;
12 changes: 6 additions & 6 deletions test/Jamfile.v2
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ project
: requirements
<library>/boost/timer//boost_timer
;

run ../example/auto_cpu_timer_example.cpp : : : <test-info>always_show_run_output ;

run cpu_timer_info.cpp : : : <test-info>always_show_run_output ;
run cpu_timer_info.cpp : : : <test-info>always_show_run_output <library>/boost/detail//boost_detail ;

run cpu_timer_test.cpp
: : : <test-info>always_show_run_output ;
: : : <test-info>always_show_run_output <library>/boost/detail//boost_detail ;

run ../example/timex.cpp : echo "Hello, world" : : <test-info>always_show_run_output ;

compile original_timer_test.cpp ;

run chrono_conflict_test.cpp /boost/chrono//boost_chrono : : : <link>static ;

run progress_display_test.cpp ;
run progress_display_test.cpp /boost/core//boost_core ;

run /boost/tools/inspect//inspect/<variant>release : $(parent) -text -brief : : <test-info>always_show_run_output : inspect ;
explicit inspect ;
# run /boost/tools/inspect//inspect/<variant>release : $(parent) -text -brief : : <test-info>always_show_run_output : inspect ;
# explicit inspect ;

0 comments on commit e639810

Please sign in to comment.