Changeset e384c5

Timestamp:

01/23/12 18:07:49 (4 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', 'deebf2045e7119c339412580f37a1e653f7d5715')('controller-upgrade', '00f95d22e12d96ef089e0902ef62ae8ce841dc6f')

Children:

31a0b22da96896de48dbdba391a572b8507be307

Parents:

fec44a8e77c8c4485b2f8d21ee78b7f77b280884

git-author:

Micke Prag <micke.prag@telldus.se>2012-01-23 18:07:49+01:00

git-committer:

Micke Prag <micke.prag@telldus.se>2012-01-23 18:07:49+01:00

Message:

When reading the target executable for prerequisites we must include the DESTDIR, else we might read an already installed file

File:

• telldus-core/service/CMakeLists.txt (modified) (1 diff)

telldus-core/service/CMakeLists.txt

@@ -222 +222 @@
                 INCLUDE(GetPrerequisites)
                 GET_FILENAME_COMPONENT(DESTDIR \$ENV{DESTDIR} ABSOLUTE)
-                GET_PREREQUISITES(\"${TELLDUS_SERVICE_TARGET_PATH}/${telldus-service_TARGET}\" prereqs 1 0 \"\$\" \"\$\")
+                GET_PREREQUISITES(\"\${DESTDIR}/${TELLDUS_SERVICE_TARGET_PATH}/${telldus-service_TARGET}\" prereqs 1 0 \"\$\" \"\$\")
                 FOREACH(pr \${prereqs})
                         GET_FILENAME_COMPONENT(lib \${pr} NAME)