Skip to content

Commit 0d4e4ef

Browse files
committed
working: solving multiple definition linking error
1 parent 54a4b1d commit 0d4e4ef

File tree

6 files changed

+33
-62
lines changed

6 files changed

+33
-62
lines changed

gklearn/gedlib/gedlibpy.py

Lines changed: 0 additions & 53 deletions
This file was deleted.

gklearn/gedlib/setup_core.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ def get_extensions():
6565
# sources=["gedlibpy.pyx", "src/GedLibBind.cpp"],
6666
sources=[
6767
"common_bind.pyx", "gedlibpy_gxl.pyx", "gedlibpy_attr.pyx",
68-
"src/gedlib_bind_gxl.cpp", "src/gedlib_bind_attr.cpp", "src/gedlib_bind_util.cpp"
68+
"src/gedlib_bind_gxl.cpp", "src/gedlib_bind_attr.cpp", "src/gedlib_bind_util.cpp",
69+
"include/gedlib-master/src/env/ged_env.gxl.cpp"
6970
],
7071
include_dirs=[
7172
"src",

gklearn/gedlib/src/gedlib_bind_attr.hpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@
2727
#include <map>
2828
#include <list>
2929
#include <iostream>
30-
#include "../include/gedlib-master/src/env/ged_env.hpp"
31-
#include "../include/gedlib-master/src/env/node_map.hpp"
32-
#include "../include/gedlib-master/src/env/common_types.hpp"
30+
//#include "../include/gedlib-master/src/env/ged_env.hpp"
31+
//#include "../include/gedlib-master/src/env/node_map.hpp"
32+
//#include "../include/gedlib-master/src/env/common_types.hpp"
33+
#include "gedlib_header.hpp"
3334
#include "gedlib_bind_util.hpp"
3435

3536

gklearn/gedlib/src/gedlib_bind_gxl.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@
2424
#include <map>
2525
#include <list>
2626
#include <iostream>
27-
#include "../include/gedlib-master/src/env/ged_env.hpp"
28-
#include "../include/gedlib-master/src/env/node_map.hpp"
27+
//#include "../include/gedlib-master/src/env/ged_env.hpp"
28+
//#include "../include/gedlib-master/src/env/node_map.hpp"
29+
#include "gedlib_header.hpp"
2930
#include "gedlib_bind_util.hpp"
3031

3132

gklearn/gedlib/src/gedlib_bind_util.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#include <string>
2323
#include <vector>
2424
#include <iostream>
25-
#include "../include/gedlib-master/src/env/ged_env.hpp"
26-
#include "../include/gedlib-master/src/env/node_map.hpp"
27-
25+
//#include "../include/gedlib-master/src/env/ged_env.hpp"
26+
//#include "../include/gedlib-master/src/env/node_map.hpp"
27+
#include "gedlib_header.hpp"
2828

2929
/*!
3030
* @namespace pyged
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/****************************************************************************
2+
* *
3+
* Copyright (C) 2019-2025 by Linlin Jia, Natacha Lambert, and David B. *
4+
* Blumenthal *
5+
* *
6+
* This file should be used by Python. *
7+
* Please call the Python module if you want to use GedLib with this code.*
8+
* *
9+
* Otherwise, you can directly use GedLib for C++. *
10+
* *
11+
***************************************************************************/
12+
13+
/*!
14+
* @file gedlib_header.hpp
15+
* @brief Include all headers of GEDLIB to avoid multiple includes.
16+
*/
17+
#pragma once
18+
19+
#include "../include/gedlib-master/src/env/ged_env.hpp"
20+
#include "../include/gedlib-master/src/env/node_map.hpp"
21+
#include "../include/gedlib-master/src/env/common_types.hpp"

0 commit comments

Comments
 (0)