The Wintermute Project

Merge lp://qastaging/~gentoolx/wintermute/linguistics-devel.cmake-integration into lp://qastaging/~wintermute-devel/wintermute/linguistics-devel

  1. linguistics-devel.cmake-integration
  2. Merge into linguistics-devel
Proposed by Adrian Borucki
Status: Merged
Approved by: Jacky Alciné
Approved revision: 25
Merged at revision: 24
Proposed branch: lp://qastaging/~gentoolx/wintermute/linguistics-devel.cmake-integration
Merge into: lp://qastaging/~wintermute-devel/wintermute/linguistics-devel
Diff against target: 3077 lines (+1313/-1523)
24 files modified
CMakeLists.txt (+73/-0)
Makefile (+10/-11)
WntrLingConfig.cmake.in (+17/-0)
wntrling-cli/CMakeLists.txt (+11/-14)
wntrling-cli/src/main.cpp (+2/-2)
wntrling-core/CMakeLists.txt (+28/-32)
wntrling-core/dox.conf (+4/-4)
wntrling-core/include/wntr/ling/core/md5.hpp (+93/-0)
wntrling-core/include/wntr/ling/core/parser.hpp (+283/-0)
wntrling-core/include/wntr/ling/core/syntax.hpp (+629/-0)
wntrling-core/include/wntr/ling/core/wntrling.hpp (+31/-0)
wntrling-core/src/md5.hpp (+0/-93)
wntrling-core/src/parser.hpp (+0/-283)
wntrling-core/src/syntax.cpp (+2/-2)
wntrling-core/src/syntax.hpp (+0/-629)
wntrling-core/src/wntrling.cpp (+0/-1)
wntrling-core/src/wntrling.hpp (+0/-31)
wntrling-core/wntrling-core.pc (+6/-6)
wntrling-en/CMakeLists.txt (+22/-26)
wntrling-en/include/wntr/ling/en/EnglishParser.hpp (+96/-0)
wntrling-en/src/EnglishParser.cpp (+2/-2)
wntrling-en/src/EnglishParser.cpp.save (+0/-287)
wntrling-en/src/EnglishParser.hpp (+0/-96)
wntrling-en/wntrling-en.pc (+4/-4)
To merge this branch: bzr merge lp://qastaging/~gentoolx/wintermute/linguistics-devel.cmake-integration
Reviewer Review Type Date Requested Status
Jacky Alciné codebase-update Approve
Review via email: mp+59787@code.qastaging.launchpad.net

Description of the change

This merge proposal involves very important CMake configuration improvement, allowing to build current code with WntrData dependency, it also allows to use project in other CMake projects in CMake way (WntrLingConfig.cmake file provided).

To post a comment you must log in.
Revision history for this message
Jacky Alciné (jackyalcine) wrote :

Does it have pkg-config information as well?

Revision history for this message
Adrian Borucki (gentoolx) wrote :

> Does it have pkg-config information as well?
Yes, of course.

Revision history for this message
Jacky Alciné (jackyalcine) wrote :

> > Does it have pkg-config information as well?
> Yes, of course.
Awesome.

Revision history for this message
Jacky Alciné (jackyalcine) :
review: Approve (codebase-update)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: