diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-09-05 15:57:52 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-09-05 15:57:52 +0000 |
| commit | 95b03c59944aad8d350a46ab2055278ec9f6efd5 (patch) | |
| tree | 8c1283ad06492c699a1b1b5565a6d6b2e39a3111 /navit/CMakeLists.txt | |
| parent | 051a26b8b7bc69f3b6936891ab2543d89ab3b9e5 (diff) | |
| download | navit-95b03c59944aad8d350a46ab2055278ec9f6efd5.tar.gz | |
Fix:Build:Better bundle building
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4761 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/CMakeLists.txt')
| -rw-r--r-- | navit/CMakeLists.txt | 20 |
1 files changed, 15 insertions, 5 deletions
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() |