From f6796c2db4d3591f35030efc5b1596698ddd3077 Mon Sep 17 00:00:00 2001 From: Ilkka Aulomaa Date: Fri, 8 Mar 2013 17:03:12 +0200 Subject: Fix for TDIS-4472. Use correct manifest file for x86 device, insted of emulator one. --- main/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'main') 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}) -- cgit v1.2.3