Skip to content

Commit 6befd77

Browse files
authored
Merge pull request #357 from calband/issue/remove_boost_dependency
removing boost dependency from calchart.
2 parents 9361677 + f125fa6 commit 6befd77

File tree

4 files changed

+1
-43
lines changed

4 files changed

+1
-43
lines changed

CMakeLists.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ configure_file (
3939
# calchart_cmd: CLI for parsing files and testing
4040
# CalChart: The App itself
4141

42-
# CalChart requires Boost. Find it and include the directories here.
43-
find_package (Boost 1.60 REQUIRED)
44-
4542
# CalChart requires BISON/FLEX for the grammar
4643
find_package (BISON REQUIRED)
4744
find_package (FLEX REQUIRED)
@@ -140,7 +137,6 @@ target_include_directories (
140137
calchart_core
141138
PRIVATE
142139
${CMAKE_CURRENT_SOURCE_DIR}/src/core
143-
${Boost_INCLUDE_DIRS}
144140
${PROJECT_BINARY_DIR}/version
145141
${CMAKE_CURRENT_SOURCE_DIR}/submodules/munkres-cpp/src
146142
)
@@ -176,7 +172,6 @@ target_include_directories (
176172
PRIVATE
177173
"${CMAKE_CURRENT_SOURCE_DIR}/src/core"
178174
"${CMAKE_CURRENT_SOURCE_DIR}/src"
179-
"${Boost_INCLUDE_DIRS}"
180175
"${PROJECT_BINARY_DIR}/version"
181176
)
182177

@@ -321,14 +316,13 @@ set_target_properties (
321316
"${AllResources}"
322317
)
323318

324-
target_link_libraries (CalChart calchart_core ${Boost_LIBRARIES})
319+
target_link_libraries (CalChart calchart_core)
325320
target_link_libraries (CalChart nlohmann_json::nlohmann_json)
326321

327322
#target_link_libraries (
328323
# CalChart
329324
# PRIVATE
330325
# calchart_core
331-
# ${Boost_LIBRARIES}
332326
# nlohmann_json::nlohmann_json
333327
# )
334328

@@ -353,7 +347,6 @@ target_include_directories (
353347
"${CMAKE_CURRENT_SOURCE_DIR}/src"
354348
"${CMAKE_CURRENT_SOURCE_DIR}/resources"
355349
"${CMAKE_CURRENT_SOURCE_DIR}/submodules/munkres-cpp/src"
356-
"${Boost_INCLUDE_DIRS}"
357350
"${PROJECT_BINARY_DIR}/version"
358351
)
359352

README-MACOSX.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ https://trac.macports.org/ticket/58450
2727

2828
$ brew install cmake
2929

30-
### Boost
31-
32-
CalChart uses Boost. See boost.org for more information about what Boost is. You will need to make sure it is installed on your system somewhere common so CMake can find it. I recommend using brew to install it. See https://brew.sh.
33-
34-
$ brew install boost
35-
3630
## Building CalChart:
3731

3832
CalChart uses cmake to configure and run the platform specific build system. For Mac we use Xcode.

README-WINDOWS.md

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,12 @@ We tried Visual Studio Community 2017.
1818
You'll need to install the "Visual C++" "Common Tools for Visual C++ 2017".
1919

2020

21-
## Download Boost
22-
Visit http://www.boost.org/ and download the latest version of Boost.
23-
Place the downloaded Boost directory somewhere on your computer:
24-
25-
e.g. c:\boost
26-
27-
Remember where you place this Boost directory. In the next section, I will refer to the directory as $YOUR_BOOST_DIRECTORY. In the example above, $YOUR_BOOST_DIRECTORY = `c:\boost`
28-
2921
## Add environment variables
3022
Go to Control Panel->System->Advanced System Settings->Environment Variables
3123
Add the following User variables:
3224

33-
BOOST_DIR=$YOUR_BOOST_DIRECTORY
34-
BOOST_ROOT=$YOUR_BOOST_DIRECTORY
35-
Boost_INCLUDE_DIR=$YOUR_BOOST_DIRECTORY
3625
CMAKE_PREFIX_PATH=$PATH_TO_BISON
3726

38-
(see the `Download Boost` section above for the meaning of $YOUR_BOOST_DIRECTORY)
39-
40-
4127
## Get CMake
4228
Read instructions at
4329
https://cmake.org/download/

src/core/CalChartShowMode.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
#include <string>
3030
#include <vector>
3131

32-
#include <boost/serialization/access.hpp>
33-
#include <boost/serialization/array.hpp>
34-
3532
namespace CalChart {
3633

3734
static constexpr auto SPR_YARD_LEFT = 8;
@@ -114,18 +111,6 @@ class ShowMode {
114111

115112
YardLinesInfo_t mYardLines;
116113

117-
friend class boost::serialization::access;
118-
template <class Archive>
119-
void serialize(Archive& ar, const unsigned int /*version*/)
120-
{
121-
ar& mSize;
122-
ar& mOffset;
123-
ar& mBorder1;
124-
ar& mBorder2;
125-
ar& mHashW;
126-
ar& mHashE;
127-
ar& mYardLines;
128-
}
129114
friend bool operator==(ShowMode const& lhs, ShowMode const& rhs);
130115
};
131116

0 commit comments

Comments
 (0)