Merge lp:~shlomif-gmail/inkscape/inkscape into lp:~inkscape.dev/inkscape/trunk
Proposed by
Shlomi Fish
Status: | Merged |
---|---|
Merge reported by: | su_v |
Merged at revision: | not available |
Proposed branch: | lp:~shlomif-gmail/inkscape/inkscape |
Merge into: | lp:~inkscape.dev/inkscape/trunk |
Diff against target: |
170 lines (+80/-15) 5 files modified
CMakeLists.txt (+0/-6) CMakeScripts/DefineDependsandFlags.cmake (+21/-7) CMakeScripts/Modules/FindLCMS2.cmake (+38/-0) config.h.cmake (+11/-1) src/CMakeLists.txt (+10/-1) |
To merge this branch: | bzr merge lp:~shlomif-gmail/inkscape/inkscape |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Inkscape Developers | Pending | ||
Review via email: mp+217083@code.launchpad.net |
Description of the change
This fixes the handling of LCMS / LCMS2 by the CMake build system.
To post a comment you must log in.
Should change branch status to merged.