Noise

Merge lp:~xapantu/noise/fix-build into lp:~elementary-apps/noise/trunk

  1. fix-build
  2. Merge into trunk
Proposed by xapantu
Status: Merged
Approved by: Raphael Isemann
Approved revision: 1649
Merged at revision: 1650
Proposed branch: lp:~xapantu/noise/fix-build
Merge into: lp:~elementary-apps/noise/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
src/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~xapantu/noise/fix-build
Reviewer Review Type Date Requested Status
Raphael Isemann (community) Approve
Review via email: mp+229702@code.launchpad.net

Commit message

Fixed build-issue with make -jX for X > 1

Description of the change

Puts the executable with it source. Nobody wants to put b library in root, or a gir, or a schema in root, so why an exec? and on top of that, (and this is what bother me, because I wouldn't care otherwise), it forces to do some hackish things in cmake.

And it fixes the build problem. (Which could have been fixed differently, but it is definitively cleaner this way)

To post a comment you must log in.
Revision history for this message
Raphael Isemann (teemperor) wrote :

Works now, app still runs and behaves normal and runs with make + multiple jobs.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/CMakeLists.txt'
2--- src/CMakeLists.txt 2014-06-29 08:38:13 +0000
3+++ src/CMakeLists.txt 2014-08-05 22:30:52 +0000
4@@ -98,7 +98,7 @@
5 ${CLIENT_VAPI}
6 )
7
8-set (EXEC_NAME ../${SRC_TARGET})
9+set (EXEC_NAME ${SRC_TARGET})
10
11 add_definitions (${DEPS_CFLAGS})
12 link_directories (${DEPS_LIBRARY_DIRS})

Subscribers

People subscribed via source and target branches