Merge lp:~elementary-pantheon/pantheon-greeter/update-cmake-modules into lp:~elementary-pantheon/pantheon-greeter/trunk
Status: | Work in progress |
---|---|
Proposed branch: | lp:~elementary-pantheon/pantheon-greeter/update-cmake-modules |
Merge into: | lp:~elementary-pantheon/pantheon-greeter/trunk |
Diff against target: |
636 lines (+203/-311) 6 files modified
CMakeLists.txt (+1/-1) cmake/FindGirCompiler.cmake (+56/-0) cmake/GObjectIntrospectionMacros.cmake (+34/-0) cmake/Makefile (+0/-286) cmake/Translations.cmake (+37/-12) cmake/ValaPrecompile.cmake (+75/-12) |
To merge this branch: | bzr merge lp:~elementary-pantheon/pantheon-greeter/update-cmake-modules |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sergey "Shnatsel" Davidoff (community) | Needs Fixing | ||
Review via email: mp+228366@code.launchpad.net |
This proposal supersedes a proposal from 2014-07-25.
Description of the change
Drop the included autogenerated makefile and update CMake modules to latest version from https:/
Build now fails with the following error log:
...
Scanning dependencies of target pantheon-greeter
make[3]: Leaving directory `/home/
make -f CMakeFiles/
make[3]: Entering directory `/home/
/usr/bin/cmake -E cmake_progress_
[ 11%] Building C object CMakeFiles/
/usr/bin/
x86_64-
x86_64-
compilation terminated.
make[3]: *** [CMakeFiles/
make[3]: Leaving directory `/home/
make[2]: *** [CMakeFiles/
make[2]: Leaving directory `/home/
make[1]: *** [all] Error 2
make[1]: Leaving directory `/home/
dh_auto_build: make -j1 returned exit code 2
make: *** [build] Error 2
Unmerged revisions
- 272. By Sergey "Shnatsel" Davidoff
-
update vala_precompile invocation in CMakeLists.txt, this should fix build
- 271. By Sergey "Shnatsel" Davidoff
-
Update CMake modules, drop autogenerated makefile
tom95 [11:01 PM] shnatsel: yeah, vala_precompile was updated, the first argument is now the targetname. So it assumes PopOver.vala is the target and not a source file that it has to compile
shnatsel [11:02 PM] How do I fix that?
tom95 [11:02 PM] shnatsel: you insert pantheon-greeter right after VALA_C