Skip to content

Commit 737de9d

Browse files
committed
Move shape package to new library
1 parent 4fee899 commit 737de9d

27 files changed

+29
-5915
lines changed

extern/CMakeLists.txt

+9
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@ FetchContent_Declare(
1010
EXCLUDE_FROM_ALL)
1111
FetchContent_MakeAvailable(optimizationtools)
1212

13+
# Fetch fontanf/shape.
14+
FetchContent_Declare(
15+
shape
16+
GIT_REPOSITORY https://github.com/fontanf/shape.git
17+
GIT_TAG 77f0d7b2b1cbcf1d53042a886b9221644202d1f6
18+
#SOURCE_DIR "${PROJECT_SOURCE_DIR}/../shape/"
19+
EXCLUDE_FROM_ALL)
20+
FetchContent_MakeAvailable(shape)
21+
1322
# Fetch fontanf/mathoptsolverscmake.
1423
set(MATHOPTSOLVERSCMAKE_USE_CLP ON)
1524
FetchContent_Declare(

include/packingsolver/irregular/instance.hpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22

33
#include "packingsolver/algorithms/common.hpp"
44

5-
#include "packingsolver/irregular/shape.hpp"
5+
#include "shape/shape.hpp"
66

77
namespace packingsolver
88
{
99
namespace irregular
1010
{
1111

12+
using namespace shape;
13+
1214
////////////////////////////////////////////////////////////////////////////////
1315
///////////////////////// Item type, Bin type, Defect //////////////////////////
1416
////////////////////////////////////////////////////////////////////////////////

include/packingsolver/irregular/shape.hpp

-366
This file was deleted.

0 commit comments

Comments
 (0)