Files

Merge lp:~jeremywootten/pantheon-files/fix-1663892-build-from-scratch into lp:~elementary-apps/pantheon-files/trunk

  1. fix-1663892-build-from-scratch
  2. Merge into trunk
Proposed by Jeremy Wootten
Status: Merged
Merged at revision: 2487
Proposed branch: lp:~jeremywootten/pantheon-files/fix-1663892-build-from-scratch
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 12 lines (+2/-0)
1 file modified
libcore/tests/UtilTests/CMakeLists.txt (+2/-0)
To merge this branch: bzr merge lp:~jeremywootten/pantheon-files/fix-1663892-build-from-scratch
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+317029@code.launchpad.net

Description of the change

This branch fixes a regression introduced by r2482 where the source will not compile on a system that has not already had pantheon-files installed due to missing .vapi paths in one CMakeLists.txt file.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libcore/tests/UtilTests/CMakeLists.txt'
2--- libcore/tests/UtilTests/CMakeLists.txt 2017-02-07 11:52:00 +0000
3+++ libcore/tests/UtilTests/CMakeLists.txt 2017-02-11 16:20:55 +0000
4@@ -30,6 +30,8 @@
5 pantheon-files-core-C
6 OPTIONS
7 --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/
8+ --vapidir=${CMAKE_SOURCE_DIR}/libcore/
9+ --vapidir=${CMAKE_BINARY_DIR}/libcore/
10 --thread
11 --target-glib=2.32 # Needed for new thread API
12 )

Subscribers

People subscribed via source and target branches

to all changes: