Skip to content

Commit

Permalink
Merge pull request #419 from micro-manager/mmcore-public-headers
Browse files Browse the repository at this point in the history
Remove unused #include in MMCore
  • Loading branch information
marktsuchida authored Dec 15, 2023
2 parents 3f1f6dd + 1234bfd commit 5a7cefa
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
1 change: 0 additions & 1 deletion MMCore/MMCore.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
#include "../MMDevice/MMDevice.h"
#include "../MMDevice/MMDeviceConstants.h"
#include "Configuration.h"
#include "CoreUtils.h"
#include "Error.h"
#include "ErrorCodes.h"
#include "Logging/Logger.h"
Expand Down
9 changes: 6 additions & 3 deletions MMCore/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,15 @@ mmcore_public_headers = files(
'Configuration.h',
'Error.h',
'ErrorCodes.h',
'Logging/GenericLogger.h',
'Logging/Logger.h',
'Logging/Metadata.h',
'Logging/GenericMetadata.h',
'MMCore.h',
'MMEventCallback.h',
# TODO MMCore.h currently includes Logging/Logger.h and CoreUtils.h, which
# should not be public. That will need to be fixed before we support
# installing the public headers.
)
# Note that the MMDevice headers are also needed; which of those are part of
# MMCore's public interface is poorly defined at the moment.

# TODO Allow MMCore to be built as a shared library, too. For that, we'd need
# to define the exported symbols on Windows (__declspec(dllexport)).
Expand Down

0 comments on commit 5a7cefa

Please sign in to comment.