diff options
| author | Ilkka Aulomaa <ilkkax.aulomaa@intel.com> | 2013-03-08 17:03:12 +0200 |
|---|---|---|
| committer | Ilkka Aulomaa <ilkkax.aulomaa@intel.com> | 2013-03-08 17:10:27 +0200 |
| commit | f6796c2db4d3591f35030efc5b1596698ddd3077 (patch) | |
| tree | 3bb7d33961173b52e1ed48cfc7e709ab291f2f71 /main | |
| parent | bc832e5ad4fe509b82ba1b0526d5a55f31c7b9dd (diff) | |
| download | message-app-f6796c2db4d3591f35030efc5b1596698ddd3077.tar.gz message-app-f6796c2db4d3591f35030efc5b1596698ddd3077.tar.bz2 message-app-f6796c2db4d3591f35030efc5b1596698ddd3077.zip | |
Fix for TDIS-4472. Use correct manifest file for x86 device, insted of emulator one.
Diffstat (limited to 'main')
| -rwxr-xr-x | main/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index bf2d55f..c4463aa 100755 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -51,11 +51,11 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} ${CMAKE_LDFLAGS} msg-commo #Install desktop file & icon. INSTALL(TARGETS message DESTINATION bin) -IF("${ARCH}" MATCHES "^arm.*") +IF("${SIMULATOR}" MATCHES "yes") + CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PKGNAME}.xml.emul ${CMAKE_SOURCE_DIR}/${PKGNAME}.xml) +ELSE("${SIMULATOR}" MATCHES "yes") CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PKGNAME}.xml.target ${CMAKE_SOURCE_DIR}/${PKGNAME}.xml) -ELSE("${ARCH}" MATCHES "^arm.*") - CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PKGNAME}.xml.emul ${CMAKE_SOURCE_DIR}/${PKGNAME}.xml) -ENDIF("${ARCH}" MATCHES "^arm.*") +ENDIF("${SIMULATOR}" MATCHES "yes") INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PKGNAME}.xml DESTINATION /usr/share/packages) INSTALL(FILES ${CMAKE_SOURCE_COMMON_DIR}/data/image/${PKGNAME}.png DESTINATION ${ICONDIR}) INSTALL(FILES ${CMAKE_SOURCE_COMMON_DIR}/data/image/${PKGNAME}.voice.png DESTINATION ${ICONDIR}) |