openmicroscopy/openmicroscopy — pull request #2964 by rleigh-dundee (2014-08-22 20:37:48+00:00)
Title: OmeroCpp: Correct ice globbing

- Correctly glob model sources; some static model sources were excluded
- Add ModelF to model; previously included implicitly
- Add ServicesF to api

The main purpose is to correct a bug (missing static model sources) and to move ModelF and ServicesF to the correct component, snapping two circular deps between model/api and common (more are still present and still need fixing). Since this is all still compiled as a single library, the link snapping has no functional effect at present; it's just one step on the way to fixing things.

--------

Testing: Run

```
cmake -Ddebug-ice-generation=ON /path/to/openmicroscopy
```

before and after this PR is merged. Start with a clean openmicroscopy.git the first time. Compare the output to verify that additional files are included:

- `components/blitz/resources/omero/model/Details.ice`, `components/blitz/resources/omero/model/IObject.ice` and `components/blitz/resources/omero/model/Permissions.ice` in "Static slice definitions (model)"
- `components/blitz/resources/omero/ServicesF.ice` in "Static slice definitions (api)", moved from "(common)"