Skip to content

Commit a586983

Browse files
committed
Fetch mmcore/mmdevice via wrap
This fixes the sdist; it now contains just the needed files. Note that an mmdevice.wrap is explicitly included, in order to override the one provided by mmcore, so that we pin the version.
1 parent 0e7eeef commit a586983

5 files changed

Lines changed: 29 additions & 5 deletions

File tree

meson.build

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ project(
2424
'cpp_std=c++14',
2525
'warning_level=3',
2626
],
27-
# Until MMDevice and MMCore are available individually, we need to use them
28-
# from the same git submodule, so this is a bit of a hack:
29-
subproject_dir: 'mmCoreAndDevices',
3027
)
3128

3229
cxx = meson.get_compiler('cpp')
@@ -61,7 +58,7 @@ swig = find_program('swig', native: true)
6158
# support by Meson in order to get the SWIG include directories from the
6259
# dependency object.
6360
mmcore_proj = subproject(
64-
'MMCore',
61+
'mmcore',
6562
default_options: {
6663
'default_library': 'static',
6764
'tests': 'disabled', # Avoid Catch2 subproject in sdist

mmCoreAndDevices

Submodule mmCoreAndDevices deleted from 4c291a6

subprojects/.gitignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/packagecache/
2+
3+
/mmcore/
4+
/mmdevice/
5+
6+
# Subprojects installed by meson wrap
7+
/*-*/
8+
9+
# Ignore *.wrap by default (may be auto-installed transitive dependencies)
10+
/*.wrap
11+
12+
# Do not ignore wraps we provide
13+
!/mmcore.wrap
14+
!/mmdevice.wrap

subprojects/mmcore.wrap

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[wrap-git]
2+
url = https://github.com/micro-manager/mmcore.git
3+
revision = 187adc00dac41b5257dc34068cc42042152dcd93
4+
depth = 1
5+
6+
[provide]
7+
dependency_names = mmcore

subprojects/mmdevice.wrap

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[wrap-git]
2+
url = https://github.com/micro-manager/mmdevice.git
3+
revision = 19efe5076245d19ccb486ee337f2330f172ce180
4+
depth = 1
5+
6+
[provide]
7+
dependency_names = mmdevice

0 commit comments

Comments
 (0)