diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | navit/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | navit/xpm/CMakeLists.txt | 1 |
3 files changed, 17 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e497cf46..18cbf8083 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -453,6 +453,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) endif() set(LOCALEDIR "${LOCALE_DIR}/locale") diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt index 3c8497044..d44fac23c 100644 --- a/navit/CMakeLists.txt +++ b/navit/CMakeLists.txt @@ -66,18 +66,27 @@ endforeach() add_subdirectory (fib-1.1) if(NOT ANDROID) + set(NAVIT_START_SRC start.c) if(WIN32 OR WINCE AND NOT WIN_OMIT_RESOURCES) - add_executable (navit start.c ${CMAKE_CURRENT_SOURCE_DIR}/gui/win32/resources/resource.rc) + list(APPEND NAVIT_START_SRC ${CMAKE_CURRENT_SOURCE_DIR}/gui/win32/resources/resource.rc) else() if (APPLE) - add_executable (navit MACOSX_BUNDLE start.c) - else() - add_executable (navit start.c) + set(NAVIT_START_SRC start_apple.m) endif() endif() - + if (BUILD_BUNDLE) + list(APPEND NAVIT_START_SRC resources/share) + endif() + add_executable(navit ${NAVIT_START_SRC}) target_link_libraries (navit ${NAVIT_LIBNAME}) set_target_properties(navit PROPERTIES COMPILE_DEFINITIONS "MODULE=${MODULE_NAME}") + if (BUILD_BUNDLE) + add_custom_command(OUTPUT resources/share COMMAND mkdir -p resources/share) + set_source_files_properties(resources/share PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + set_target_properties(navit PROPERTIES MACOSX_BUNDLE TRUE) + add_dependencies(navit navit_config_xml_resource) + add_dependencies(navit images_resource) + endif() endif() if (SHARED_LIBNAVIT) @@ -134,6 +143,7 @@ if(ANDROID) add_custom_target( navit_config_xml ALL DEPENDS navithdpi.xml navitmdpi.xml navitldpi.xml) else() process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navit.xml "") + add_custom_target( navit_config_xml_resource DEPENDS navit.xml COMMAND mkdir -p resources/share/navit COMMAND cp navit.xml resources/share/navit) add_custom_target( navit_config_xml ALL DEPENDS navit.xml) endif() diff --git a/navit/xpm/CMakeLists.txt b/navit/xpm/CMakeLists.txt index a614b83eb..c61e016b1 100644 --- a/navit/xpm/CMakeLists.txt +++ b/navit/xpm/CMakeLists.txt @@ -100,6 +100,7 @@ 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) install( FILES ${IMAGE_TARGETS} |