From: martin-s Date: Tue, 4 Oct 2011 17:49:06 +0000 (+0000) Subject: Fix:Build:Fixed osx bundle creation X-Git-Tag: navit-0.5.0.5194svn~370 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ffbd264893bc57f81e2873f5f582a40dbe7371bc;p=profile%2Fivi%2Fnavit.git Fix:Build:Fixed osx bundle creation git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4825 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt index 6540d06..97fa256 100755 --- a/navit/CMakeLists.txt +++ b/navit/CMakeLists.txt @@ -459,7 +459,7 @@ endif() if (APPLE OR USE_UIKIT) set_with_reason(vehicle/iphone "apple detected" TRUE) set_with_reason(graphics/cocoa "apple detected" TRUE) - set(BUILD_BUNDLE TRUE) + set(BUILD_BUNDLE TRUE CACHE BOOLEAN "build an osx bundle") endif() set(LOCALEDIR "${LOCALE_DIR}/locale") diff --git a/navit/navit/xpm/CMakeLists.txt b/navit/navit/xpm/CMakeLists.txt index c61e016..3663557 100644 --- a/navit/navit/xpm/CMakeLists.txt +++ b/navit/navit/xpm/CMakeLists.txt @@ -100,7 +100,8 @@ foreach (IMAGE_SRC ${FILES_TO_PNG}) endforeach() add_custom_target(images ALL DEPENDS ${IMAGE_TARGETS}) -add_custom_target(images_resource DEPENDS images COMMAND mkdir -p ../resources/share/navit/xpm COMMAND cp ${IMAGE_TARGETS} ../resources/share/navit/xpm) +add_custom_target(images_resource COMMAND mkdir -p ../resources/share/navit/xpm COMMAND cp ${IMAGE_TARGETS} ../resources/share/navit/xpm) +add_dependencies(images_resource images) install( FILES ${IMAGE_TARGETS}