@@ -1,6 +1,6 | |||||
1 |
|
1 | |||
2 | catalogicpp_dep = dependency('catalogicpp', required : true, fallback:['catalogicpp','catalogicpp_dep']) |
|
2 | catalogicpp_dep = dependency('catalogicpp', required : true, fallback:['catalogicpp','catalogicpp_dep']) | |
3 | pybind11_dep = dependency('pybind11', required : true, fallback:['pybind11','pybind11_dep']) |
|
3 | #pybind11_dep = dependency('pybind11', required : true, fallback:['pybind11','pybind11_dep']) | |
4 | timeseries_dep = dependency('TimeSeries', required : true, fallback:['TimeSeries','time_series_dep']) |
|
4 | timeseries_dep = dependency('TimeSeries', required : true, fallback:['TimeSeries','time_series_dep']) | |
5 | cpp_utils_dep = dependency('cpp_utils', fallback:['cpp_utils','cpp_utils_dep']) |
|
5 | cpp_utils_dep = dependency('cpp_utils', fallback:['cpp_utils','cpp_utils_dep']) | |
6 |
|
6 | |||
@@ -78,28 +78,28 sciqlop_core_lib = library('sciqlopcore', | |||||
78 | core_moc_files, |
|
78 | core_moc_files, | |
79 | cpp_args : '-DCORE_LIB', |
|
79 | cpp_args : '-DCORE_LIB', | |
80 | include_directories : core_inc, |
|
80 | include_directories : core_inc, | |
81 |
dependencies : [qt5core, qt5network, catalogicpp_dep, |
|
81 | dependencies : [qt5core, qt5network, catalogicpp_dep, timeseries_dep, cpp_utils_dep], | |
82 | install : true |
|
82 | install : true | |
83 | ) |
|
83 | ) | |
84 |
|
84 | |||
85 |
|
85 | |||
86 | sciqlop_core = declare_dependency(link_with : sciqlop_core_lib, |
|
86 | sciqlop_core = declare_dependency(link_with : sciqlop_core_lib, | |
87 | include_directories : core_inc, |
|
87 | include_directories : core_inc, | |
88 |
dependencies : [qt5core, qt5network, catalogicpp_dep, |
|
88 | dependencies : [qt5core, qt5network, catalogicpp_dep, timeseries_dep, cpp_utils_dep]) | |
89 |
|
89 | |||
90 | pymod = import('python') |
|
90 | #pymod = import('python') | |
91 | python3 = pymod.find_installation('python3') |
|
91 | #python3 = pymod.find_installation('python3') | |
92 |
|
92 | |||
93 | pysciqlopcore_srcs = [ |
|
93 | #pysciqlopcore_srcs = [ | |
94 | './src/pybind11_wrappers/CatalogWrappers.cpp', |
|
94 | # './src/pybind11_wrappers/CatalogWrappers.cpp', | |
95 | './src/pybind11_wrappers/QtWrappers.cpp', |
|
95 | # './src/pybind11_wrappers/QtWrappers.cpp', | |
96 | './src/pybind11_wrappers/CoreWrappers.cpp' |
|
96 | # './src/pybind11_wrappers/CoreWrappers.cpp' | |
97 | ] |
|
97 | #] | |
98 |
|
98 | |||
99 |
python3.extension_module('pysciqlopcore', './src/pybind11_wrappers/CoreWrappers.cpp', |
|
99 | #python3.extension_module('pysciqlopcore', './src/pybind11_wrappers/CoreWrappers.cpp', | |
100 |
dependencies: [sciqlop_core], |
|
100 | # dependencies: [sciqlop_core], | |
101 | install: true |
|
101 | # install: true | |
102 | ) |
|
102 | # ) | |
103 |
|
103 | |||
104 |
|
104 | |||
105 | subdir('tests') |
|
105 | subdir('tests') |
General Comments 0
You need to be logged in to leave comments.
Login now