Skip to content

Commit c0ca4da

Browse files
committed
Updated build instructions and added latest Boost version.
1 parent c16c43b commit c0ca4da

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

Building.txt

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ others to augment these instructions for building on other versions of Windows.
2828

2929
6. Download and install Python from http://www.python.org/download/
3030

31-
7. Download and install Inno Setup from http://www.jrsoftware.org/isinfo.php
31+
7. Download and install Inno Setup from http://www.jrsoftware.org/isinfo.php and
32+
add "C:\Program Files\Inno Setup 5" to the PATH
3233

3334
8. Download and install the Microsoft HTML Help Workshop from
3435
http://msdn.microsoft.com/en-us/library/ms669985%28v=vs.85%29.aspx
@@ -40,10 +41,17 @@ http://msdn.microsoft.com/en-us/library/ms669985%28v=vs.85%29.aspx
4041
11. Download and install MiKTEX from http://miktex.org/
4142

4243
12. Meazure uses the Boost library including the date_time module. While there
43-
are many ways to obtain Boost, I built it from source by following the
44-
instructions in the checked answer:
44+
are many ways to obtain Boost, It is best to build boost from source.
4545

46-
http://stackoverflow.com/questions/2629421/how-to-use-boost-in-visual-studio-2010
46+
a. Download the latest Boost from http://www.boost.org
47+
48+
b. Unpack the archive into the directory C:\Program Files\boost
49+
50+
c. At the root of the boost source directory run the command: bootstrap.bat
51+
52+
d. Run the command: b2 --toolset=msvc-10.0 --build-type=complete stage
53+
54+
e. Wait a long time while Boost builds...
4755

4856
13. Once Boost has built, record its installation root directory
4957
(e.g. C:\Program Files\boost\boost_1_47_0) and set the environment
@@ -94,7 +102,7 @@ http://msdn.microsoft.com/en-us/library/ms669985%28v=vs.85%29.aspx
94102
directory build-vs10/Release
95103

96104
20. To run the unit tests run the following command from the root of the
97-
source tree:
105+
build tree (e.g. build-nmake):
98106

99107
ctest
100108

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set(BOOST_ROOT "$ENV{ProgramFiles}/boost/boost_1_47_0")
1515
set(Boost_USE_STATIC_LIBS ON)
1616
set(Boost_USE_MULTITHREADED ON)
1717
set(Boost_USE_STATIC_RUNTIME OFF)
18-
set(Boost_ADDITIONAL_VERSIONS "1.47" "1.47.0")
18+
set(Boost_ADDITIONAL_VERSIONS "1.47" "1.47.0" "1.52" "1.52.0")
1919
find_package(Boost COMPONENTS date_time REQUIRED)
2020

2121
include_directories(${Boost_INCLUDE_DIRS})

0 commit comments

Comments
 (0)