diff options
Diffstat (limited to 'navit')
| -rw-r--r-- | navit/CMakeLists.txt | 256 | ||||
| -rw-r--r-- | navit/android/CMakeLists.txt | 146 | ||||
| -rw-r--r-- | navit/binding/dbus/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | navit/binding/win32/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | navit/font/freetype/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | navit/fonts/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | navit/graphics/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | navit/graphics/cocoa/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | navit/graphics/opengl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | navit/graphics/qt5/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | navit/gui/qml/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | navit/icons/CMakeLists.txt | 210 | ||||
| -rw-r--r-- | navit/map/garmin/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | navit/maps/CMakeLists.txt | 82 | ||||
| -rw-r--r-- | navit/maptool/CMakeLists.txt | 30 | ||||
| -rw-r--r-- | navit/support/espeak/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | navit/support/glib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | navit/vehicle/gpsd/CMakeLists.txt | 8 |
18 files changed, 419 insertions, 419 deletions
diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt index a924b3396..e4a6fbd0c 100644 --- a/navit/CMakeLists.txt +++ b/navit/CMakeLists.txt @@ -6,50 +6,50 @@ include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/support") # navit core set(NAVIT_SRC announcement.c atom.c attr.c cache.c callback.c command.c config_.c coord.c country.c data_window.c debug.c - event.c file.c geom.c graphics.c gui.c item.c layout.c log.c main.c map.c maps.c - linguistics.c mapset.c maptype.c menu.c messages.c bookmarks.c navit.c navit_nls.c navigation.c osd.c param.c phrase.c plugin.c popup.c - profile.c profile_option.c projection.c roadprofile.c route.c script.c search.c speech.c start_real.c sunriset.c transform.c track.c - search_houseno_interpol.c util.c vehicle.c vehicleprofile.c xmlconfig.c ) + event.c file.c geom.c graphics.c gui.c item.c layout.c log.c main.c map.c maps.c + linguistics.c mapset.c maptype.c menu.c messages.c bookmarks.c navit.c navit_nls.c navigation.c osd.c param.c phrase.c plugin.c popup.c + profile.c profile_option.c projection.c roadprofile.c route.c script.c search.c speech.c start_real.c sunriset.c transform.c track.c + search_houseno_interpol.c util.c vehicle.c vehicleprofile.c xmlconfig.c ) if(NOT USE_PLUGINS) - list(APPEND NAVIT_SRC ${CMAKE_CURRENT_BINARY_DIR}/builtin.c) + list(APPEND NAVIT_SRC ${CMAKE_CURRENT_BINARY_DIR}/builtin.c) endif(NOT USE_PLUGINS) if (${HAVE_GLIB}) - list(APPEND NAVIT_SRC event_glib.c) + list(APPEND NAVIT_SRC event_glib.c) endif() if(ANDROID) - list(APPEND NAVIT_SRC android.c) - set(NAVIT_LIBNAME navit) + list(APPEND NAVIT_SRC android.c) + set(NAVIT_LIBNAME navit) else() - set(NAVIT_LIBNAME navit_core) + set(NAVIT_LIBNAME navit_core) endif() foreach ( PLUGIN_PATH ${ALL_PLUGINS}) - if (${PLUGIN_PATH}) - include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/${PLUGIN_PATH}") + if (${PLUGIN_PATH}) + include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/${PLUGIN_PATH}") - string(REPLACE "/" "_" MODULE_INC ${PLUGIN_PATH}) - list(APPEND NAVIT_SUPPORT_LIBS ${MODULE_INC}) - endif() + string(REPLACE "/" "_" MODULE_INC ${PLUGIN_PATH}) + list(APPEND NAVIT_SUPPORT_LIBS ${MODULE_INC}) + endif() endforeach() foreach ( MODULE_PATH ${ALL_MODULES}) - if ( ${MODULE_PATH} ) - include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_PATH}") - - string(REPLACE "/" "_" MODULE_INC ${MODULE_PATH}) - list(APPEND MODULES_PROTOTYPE "\nvoid\tmodule_${MODULE_INC}_init(void)") - list(APPEND MODULES_FUNC "\nmodule_${MODULE_INC}_init()") - - if (NOT USE_PLUGINS) - list(APPEND MODULES_NAME ${MODULE_INC}) - else() - string(REGEX REPLACE "(^[^/]*)/.*" "\\1" ${MODULE_INC}_TYPE ${MODULE_PATH}) - endif() - endif() + if ( ${MODULE_PATH} ) + include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_PATH}") + + string(REPLACE "/" "_" MODULE_INC ${MODULE_PATH}) + list(APPEND MODULES_PROTOTYPE "\nvoid\tmodule_${MODULE_INC}_init(void)") + list(APPEND MODULES_FUNC "\nmodule_${MODULE_INC}_init()") + + if (NOT USE_PLUGINS) + list(APPEND MODULES_NAME ${MODULE_INC}) + else() + string(REGEX REPLACE "(^[^/]*)/.*" "\\1" ${MODULE_INC}_TYPE ${MODULE_PATH}) + endif() + endif() endforeach() CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/builtin.c.in ${CMAKE_CURRENT_BINARY_DIR}/builtin.c) @@ -58,119 +58,119 @@ include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/fib-1.1") # Add module paths foreach (CURRENT_MODULE ${ALL_PLUGINS} ${ALL_MODULE_PLUGINS} ${ALL_MODULES}) - if (${CURRENT_MODULE}) - add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/${CURRENT_MODULE}") - endif() + if (${CURRENT_MODULE}) + add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/${CURRENT_MODULE}") + endif() endforeach() add_subdirectory (fib-1.1) if(NOT ANDROID) - set(NAVIT_START_SRC start.c) - if(WIN32 OR WINCE AND NOT WIN_OMIT_RESOURCES) - list(APPEND NAVIT_START_SRC ${CMAKE_CURRENT_SOURCE_DIR}/gui/win32/resources/resource.rc) - else() - if (APPLE) - set(NAVIT_START_SRC start_apple.m) - endif() - endif() - if (BUILD_BUNDLE) - list(APPEND NAVIT_START_SRC resources/share resources/Icon.png resources/Default.png) - add_custom_command(OUTPUT resources/Icon.png COMMAND convert -scale 79x79 -crop 60x60+8+19 ${CMAKE_CURRENT_SOURCE_DIR}/icons/desktop_icons/128x128/navit.png resources/Icon.png) - add_custom_command(OUTPUT resources/Default.png COMMAND convert -scale 79x79 -crop 60x60+8+19 ${CMAKE_CURRENT_SOURCE_DIR}/icons/desktop_icons/128x128/navit.png resources/Default.png) - endif() - add_executable(navit ${NAVIT_START_SRC}) - target_link_libraries (navit ${NAVIT_LIBNAME}) - if(DEFINED NAVIT_BINARY) - set_target_properties(navit PROPERTIES OUTPUT_NAME ${NAVIT_BINARY}) - endif(DEFINED NAVIT_BINARY) - if (BUILD_BUNDLE) - add_custom_command(OUTPUT resources/share COMMAND mkdir -p resources/share) - set_source_files_properties(resources/share resources/Icon.png resources/Default.png PROPERTIES MACOSX_PACKAGE_LOCATION Resources) - set_target_properties(navit PROPERTIES MACOSX_BUNDLE TRUE) - set_target_properties(navit PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) - add_dependencies(navit navit_config_xml_resource) - add_dependencies(navit images_resource) - add_dependencies(navit locale_resource) - endif() + set(NAVIT_START_SRC start.c) + if(WIN32 OR WINCE AND NOT WIN_OMIT_RESOURCES) + list(APPEND NAVIT_START_SRC ${CMAKE_CURRENT_SOURCE_DIR}/gui/win32/resources/resource.rc) + else() + if (APPLE) + set(NAVIT_START_SRC start_apple.m) + endif() + endif() + if (BUILD_BUNDLE) + list(APPEND NAVIT_START_SRC resources/share resources/Icon.png resources/Default.png) + add_custom_command(OUTPUT resources/Icon.png COMMAND convert -scale 79x79 -crop 60x60+8+19 ${CMAKE_CURRENT_SOURCE_DIR}/icons/desktop_icons/128x128/navit.png resources/Icon.png) + add_custom_command(OUTPUT resources/Default.png COMMAND convert -scale 79x79 -crop 60x60+8+19 ${CMAKE_CURRENT_SOURCE_DIR}/icons/desktop_icons/128x128/navit.png resources/Default.png) + endif() + add_executable(navit ${NAVIT_START_SRC}) + target_link_libraries (navit ${NAVIT_LIBNAME}) + if(DEFINED NAVIT_BINARY) + set_target_properties(navit PROPERTIES OUTPUT_NAME ${NAVIT_BINARY}) + endif(DEFINED NAVIT_BINARY) + if (BUILD_BUNDLE) + add_custom_command(OUTPUT resources/share COMMAND mkdir -p resources/share) + set_source_files_properties(resources/share resources/Icon.png resources/Default.png PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + set_target_properties(navit PROPERTIES MACOSX_BUNDLE TRUE) + set_target_properties(navit PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) + add_dependencies(navit navit_config_xml_resource) + add_dependencies(navit images_resource) + add_dependencies(navit locale_resource) + endif() endif() if (SHARED_LIBNAVIT) - add_library (${NAVIT_LIBNAME} SHARED ${NAVIT_SRC} ) + add_library (${NAVIT_LIBNAME} SHARED ${NAVIT_SRC} ) else(SHARED_LIBNAVIT) - add_library (${NAVIT_LIBNAME} STATIC ${NAVIT_SRC} ) + add_library (${NAVIT_LIBNAME} STATIC ${NAVIT_SRC} ) endif(SHARED_LIBNAVIT) if(NOT MSVC) - SET(NAVIT_LIBS ${NAVIT_LIBS} m) + SET(NAVIT_LIBS ${NAVIT_LIBS} m) endif(NOT MSVC) target_link_libraries(${NAVIT_LIBNAME} ${MODULES_NAME} ${NAVIT_SUPPORT_LIBS} fib ${NAVIT_LIBS} ) set_target_properties(${NAVIT_LIBNAME} PROPERTIES COMPILE_DEFINITIONS "MODULE=navit;LIBDIR=\"${CMAKE_INSTALL_PREFIX}/${LIB_DIR}\";PREFIX=\"${CMAKE_INSTALL_PREFIX}\"") if (DEFINED NAVIT_COMPILE_FLAGS) - set_target_properties(${NAVIT_LIBNAME} PROPERTIES COMPILE_FLAGS "${NAVIT_COMPILE_FLAGS}") + set_target_properties(${NAVIT_LIBNAME} PROPERTIES COMPILE_FLAGS "${NAVIT_COMPILE_FLAGS}") endif() ADD_CUSTOM_TARGET( - git_version - ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/version.h.in - -D DST=${CMAKE_CURRENT_BINARY_DIR}/version.h - -D NAME="GIT_VERSION" - -P ${PROJECT_SOURCE_DIR}/cmake/version.cmake -) + git_version + ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/version.h.in + -D DST=${CMAKE_CURRENT_BINARY_DIR}/version.h + -D NAME="GIT_VERSION" + -P ${PROJECT_SOURCE_DIR}/cmake/version.cmake + ) add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/navit.dtd" - COMMENT "Copy navit.dtd to ${CMAKE_CURRENT_BINARY_DIR}/navit.dtd" - COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_SOURCE_DIR}/navit/navit.dtd" "${CMAKE_CURRENT_BINARY_DIR}/navit.dtd" -) + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/navit.dtd" + COMMENT "Copy navit.dtd to ${CMAKE_CURRENT_BINARY_DIR}/navit.dtd" + COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_SOURCE_DIR}/navit/navit.dtd" "${CMAKE_CURRENT_BINARY_DIR}/navit.dtd" + ) # additional parameter are passed to the stylesheet processor as parameter macro(process_xslt SRC_XML DEST_XML) - set(XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_SOURCE_DIR}/navit/navit_shipped.xml" "${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML}" ) - if(XSL_PROCESSING) - if(NOT XSLTS STREQUAL "") - string(REPLACE "," ";" XSLTS "${XSLTS}") - foreach(tmp ${XSLTS}) - set(XSLT_FILE "${PROJECT_SOURCE_DIR}/navit/xslt/${tmp}.xslt") - list(APPEND XSLT_FILES "${XSLT_FILE}") - list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E echo Applying ${tmp}.xslt) - compose_xslt_transform_command(CMD "${XSLT_FILE}" "${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML}" "${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML}.tmp" "${ARGN}") - list(APPEND XSLT_COMMANDS ${CMD}) - list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E rename "${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML}.tmp" ${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML}) - endforeach() - endif() - endif(XSL_PROCESSING) - # Depend on all XSLT files, because the main XSLT file may pull in other files. - # Ideally we'd parse the main XSLT file for includes, but that is tricky to do reliably. - # Note that this list of files is only updated when (re)running CMake, so if files are - # added/deleted, CMake must be re-run manually. - file(GLOB ALL_XSLT_FILES "${PROJECT_SOURCE_DIR}/navit/xslt/*.xslt") - #message(FATAL_ERROR ${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML}) - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML} - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/navit/xslt/ - DEPENDS ${SRC_XML} "${CMAKE_CURRENT_BINARY_DIR}/navit.dtd" ${ALL_XSLT_FILES} - ${XSLT_COMMANDS} - ) + set(XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E copy "${PROJECT_SOURCE_DIR}/navit/navit_shipped.xml" "${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML}" ) + if(XSL_PROCESSING) + if(NOT XSLTS STREQUAL "") + string(REPLACE "," ";" XSLTS "${XSLTS}") + foreach(tmp ${XSLTS}) + set(XSLT_FILE "${PROJECT_SOURCE_DIR}/navit/xslt/${tmp}.xslt") + list(APPEND XSLT_FILES "${XSLT_FILE}") + list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E echo Applying ${tmp}.xslt) + compose_xslt_transform_command(CMD "${XSLT_FILE}" "${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML}" "${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML}.tmp" "${ARGN}") + list(APPEND XSLT_COMMANDS ${CMD}) + list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E rename "${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML}.tmp" ${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML}) + endforeach() + endif() + endif(XSL_PROCESSING) + # Depend on all XSLT files, because the main XSLT file may pull in other files. + # Ideally we'd parse the main XSLT file for includes, but that is tricky to do reliably. + # Note that this list of files is only updated when (re)running CMake, so if files are + # added/deleted, CMake must be re-run manually. + file(GLOB ALL_XSLT_FILES "${PROJECT_SOURCE_DIR}/navit/xslt/*.xslt") + #message(FATAL_ERROR ${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML}) + ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${DEST_XML} + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/navit/xslt/ + DEPENDS ${SRC_XML} "${CMAKE_CURRENT_BINARY_DIR}/navit.dtd" ${ALL_XSLT_FILES} + ${XSLT_COMMANDS} + ) endmacro() if(ANDROID) - process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navitxxxhdpi.xml OSD_SIZE=5.33 ICON_SMALL=128 ICON_MEDIUM=192 ICON_BIG=256) - process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navitxxhdpi.xml OSD_SIZE=4 ICON_SMALL=96 ICON_MEDIUM=128 ICON_BIG=192) - process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navitxhdpi.xml OSD_SIZE=2.67 ICON_SMALL=64 ICON_MEDIUM=96 ICON_BIG=128) - process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navithdpi.xml OSD_SIZE=2 ICON_SMALL=48 ICON_MEDIUM=64 ICON_BIG=96) - process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navitmdpi.xml OSD_SIZE=1.33 ICON_SMALL=32 ICON_MEDIUM=48 ICON_BIG=64) - process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navitldpi.xml OSD_SIZE=1 ICON_SMALL=24 ICON_MEDIUM=32 ICON_BIG=48) - add_custom_target( navit_config_xml ALL DEPENDS navitxxxhdpi.xml navitxxhdpi.xml navitxhdpi.xml navithdpi.xml navitmdpi.xml navitldpi.xml) + process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navitxxxhdpi.xml OSD_SIZE=5.33 ICON_SMALL=128 ICON_MEDIUM=192 ICON_BIG=256) + process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navitxxhdpi.xml OSD_SIZE=4 ICON_SMALL=96 ICON_MEDIUM=128 ICON_BIG=192) + process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navitxhdpi.xml OSD_SIZE=2.67 ICON_SMALL=64 ICON_MEDIUM=96 ICON_BIG=128) + process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navithdpi.xml OSD_SIZE=2 ICON_SMALL=48 ICON_MEDIUM=64 ICON_BIG=96) + process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navitmdpi.xml OSD_SIZE=1.33 ICON_SMALL=32 ICON_MEDIUM=48 ICON_BIG=64) + process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navitldpi.xml OSD_SIZE=1 ICON_SMALL=24 ICON_MEDIUM=32 ICON_BIG=48) + add_custom_target( navit_config_xml ALL DEPENDS navitxxxhdpi.xml navitxxhdpi.xml navitxhdpi.xml navithdpi.xml navitmdpi.xml navitldpi.xml) else() - process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navit.xml "") - add_custom_target( navit_config_xml_resource DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/navit.xml COMMAND mkdir -p resources/share/navit COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/navit.xml resources/share/navit) - add_custom_target( locale_resource DEPENDS locales COMMAND mkdir -p resources/share COMMAND cp -a ${CMAKE_CURRENT_BINARY_DIR}/../locale resources/share/locale) - add_custom_target( navit_config_xml ALL DEPENDS navit.xml) + process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml navit.xml "") + add_custom_target( navit_config_xml_resource DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/navit.xml COMMAND mkdir -p resources/share/navit COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/navit.xml resources/share/navit) + add_custom_target( locale_resource DEPENDS locales COMMAND mkdir -p resources/share COMMAND cp -a ${CMAKE_CURRENT_BINARY_DIR}/../locale resources/share/locale) + add_custom_target( navit_config_xml ALL DEPENDS navit.xml) endif() ADD_DEPENDENCIES(${NAVIT_LIBNAME} git_version) if (USE_LIBGNUINTL AND NOT HAVE_GLIB) - ADD_DEPENDENCIES(support_glib support_gettext_intl) + ADD_DEPENDENCIES(support_glib support_gettext_intl) endif() @@ -178,30 +178,30 @@ add_subdirectory (maptool) add_subdirectory (icons) add_subdirectory (maps) if(ANDROID) - add_subdirectory (android) + add_subdirectory (android) endif() install(TARGETS navit - DESTINATION ${BIN_DIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + DESTINATION ${BIN_DIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/navit.xml - DESTINATION ${SHARE_DIR} - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + DESTINATION ${SHARE_DIR} + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) get_directory_property(INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES) WRITE_FILE("cmake_plugin_settings.txt" - "set(APPLE ${APPLE} CACHE BOOL init)\n" - "set(ANDROID ${ANDROID} CACHE BOOL init)\n" - "set(USE_PLUGINS ${USE_PLUGINS} CACHE BOOL init)\n" - "set(MODULE_BUILD_TYPE \"${MODULE_BUILD_TYPE}\" CACHE STRING init)\n" - "set(NAVIT_COMPILE_FLAGS \"${NAVIT_COMPILE_FLAGS}\" CACHE STRING init)\n" - "set(navit_SOURCE_DIR \"${navit_SOURCE_DIR}\" CACHE STRING init)\n" - "set(NAVIT_LIBNAME \"${NAVIT_LIBNAME}\" CACHE STRING init)\n" - "set(ANDROID_API_VERSION \"${ANDROID_API_VERSION}\" CACHE STRING init)\n" - "set(ANDROID_NDK_API_VERSION \"${ANDROID_NDK_API_VERSION}\" CACHE STRING init)\n" - "set(CMAKE_TOOLCHAIN_FILE \"${CMAKE_TOOLCHAIN_FILE}\" CACHE STRING init)\n" - "set(INCLUDE_DIRECTORIES \"${INCLUDE_DIRECTORIES}\" CACHE STRING init)\n" - "set(LIB_DIR \"${LIB_DIR}\" CACHE STRING init)\n" - "set(CMAKE_INSTALL_PREFIX \"${CMAKE_INSTALL_PREFIX}\" CACHE STRING init)\n" -) + "set(APPLE ${APPLE} CACHE BOOL init)\n" + "set(ANDROID ${ANDROID} CACHE BOOL init)\n" + "set(USE_PLUGINS ${USE_PLUGINS} CACHE BOOL init)\n" + "set(MODULE_BUILD_TYPE \"${MODULE_BUILD_TYPE}\" CACHE STRING init)\n" + "set(NAVIT_COMPILE_FLAGS \"${NAVIT_COMPILE_FLAGS}\" CACHE STRING init)\n" + "set(navit_SOURCE_DIR \"${navit_SOURCE_DIR}\" CACHE STRING init)\n" + "set(NAVIT_LIBNAME \"${NAVIT_LIBNAME}\" CACHE STRING init)\n" + "set(ANDROID_API_VERSION \"${ANDROID_API_VERSION}\" CACHE STRING init)\n" + "set(ANDROID_NDK_API_VERSION \"${ANDROID_NDK_API_VERSION}\" CACHE STRING init)\n" + "set(CMAKE_TOOLCHAIN_FILE \"${CMAKE_TOOLCHAIN_FILE}\" CACHE STRING init)\n" + "set(INCLUDE_DIRECTORIES \"${INCLUDE_DIRECTORIES}\" CACHE STRING init)\n" + "set(LIB_DIR \"${LIB_DIR}\" CACHE STRING init)\n" + "set(CMAKE_INSTALL_PREFIX \"${CMAKE_INSTALL_PREFIX}\" CACHE STRING init)\n" + ) diff --git a/navit/android/CMakeLists.txt b/navit/android/CMakeLists.txt index 6720f4e6d..f78532297 100644 --- a/navit/android/CMakeLists.txt +++ b/navit/android/CMakeLists.txt @@ -1,86 +1,86 @@ if (ANDROID AND NOT ${CMAKE_GENERATOR} STREQUAL Ninja) - FILE(GLOB SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*/*/*/*") + FILE(GLOB SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "src/*/*/*/*") - foreach ( PERMISSION ${ANDROID_PERMISSIONS}) - set(ANDROID_PERMISSIONS_EXPANDED "${ANDROID_PERMISSIONS_EXPANDED}<uses-permission\tandroid:name=\\\"android.permission.${PERMISSION}\\\"/>" ) - endforeach() + foreach ( PERMISSION ${ANDROID_PERMISSIONS}) + set(ANDROID_PERMISSIONS_EXPANDED "${ANDROID_PERMISSIONS_EXPANDED}<uses-permission\tandroid:name=\\\"android.permission.${PERMISSION}\\\"/>" ) + endforeach() - # Generate Android string resource files from gettext .po.in files. - # Note: Android language resources should have two letter ISO 639-1 code, and, optionally, iso-3166-1-alpha-2 region code, - # so we skip all translation files which do not conform these requirements. - FILE(GLOB POIN_FILES1 RELATIVE ${CMAKE_SOURCE_DIR}/po "${CMAKE_SOURCE_DIR}/po/??.po.in") - FILE(GLOB POIN_FILES2 RELATIVE ${CMAKE_SOURCE_DIR}/po "${CMAKE_SOURCE_DIR}/po/??_??.po.in") - set(POIN_FILES ${POIN_FILES1} ${POIN_FILES2}) - foreach (POIN_FILE ${POIN_FILES}) - string(REPLACE ".po.in" "" LANG ${POIN_FILE}) - string(REPLACE "_" "-r" LANG ${LANG}) - set(LANG_RESOURCES ${LANG_RESOURCES} "${CMAKE_CURRENT_BINARY_DIR}/res/values-${LANG}/strings.xml") - compose_xslt_transform_command(TRANS "${CMAKE_CURRENT_SOURCE_DIR}/po2xml.xslt" "${CMAKE_CURRENT_SOURCE_DIR}/res/values/strings.xml" "${CMAKE_CURRENT_BINARY_DIR}/res/values-${LANG}/strings.xml" "po_file=${CMAKE_SOURCE_DIR}/po/${POIN_FILE}") - ADD_CUSTOM_COMMAND( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/res/values-${LANG}/strings.xml" - DEPENDS "${CMAKE_BINARY_DIR}/po/navit.pot" "${CMAKE_SOURCE_DIR}/po/${POIN_FILE}" "${CMAKE_CURRENT_SOURCE_DIR}/po2xml.xslt" "${CMAKE_CURRENT_SOURCE_DIR}/res/values/strings.xml" - COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res/values-${LANG} - ${TRANS} - ) - endforeach(POIN_FILE ${POIN_FILES}) + # Generate Android string resource files from gettext .po.in files. + # Note: Android language resources should have two letter ISO 639-1 code, and, optionally, iso-3166-1-alpha-2 region code, + # so we skip all translation files which do not conform these requirements. + FILE(GLOB POIN_FILES1 RELATIVE ${CMAKE_SOURCE_DIR}/po "${CMAKE_SOURCE_DIR}/po/??.po.in") + FILE(GLOB POIN_FILES2 RELATIVE ${CMAKE_SOURCE_DIR}/po "${CMAKE_SOURCE_DIR}/po/??_??.po.in") + set(POIN_FILES ${POIN_FILES1} ${POIN_FILES2}) + foreach (POIN_FILE ${POIN_FILES}) + string(REPLACE ".po.in" "" LANG ${POIN_FILE}) + string(REPLACE "_" "-r" LANG ${LANG}) + set(LANG_RESOURCES ${LANG_RESOURCES} "${CMAKE_CURRENT_BINARY_DIR}/res/values-${LANG}/strings.xml") + compose_xslt_transform_command(TRANS "${CMAKE_CURRENT_SOURCE_DIR}/po2xml.xslt" "${CMAKE_CURRENT_SOURCE_DIR}/res/values/strings.xml" "${CMAKE_CURRENT_BINARY_DIR}/res/values-${LANG}/strings.xml" "po_file=${CMAKE_SOURCE_DIR}/po/${POIN_FILE}") + ADD_CUSTOM_COMMAND( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/res/values-${LANG}/strings.xml" + DEPENDS "${CMAKE_BINARY_DIR}/po/navit.pot" "${CMAKE_SOURCE_DIR}/po/${POIN_FILE}" "${CMAKE_CURRENT_SOURCE_DIR}/po2xml.xslt" "${CMAKE_CURRENT_SOURCE_DIR}/res/values/strings.xml" + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res/values-${LANG} + ${TRANS} + ) + endforeach(POIN_FILE ${POIN_FILES}) - add_custom_command ( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/AndroidManifest.xml - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml.cmake - COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml.cmake - -D DST=${CMAKE_CURRENT_BINARY_DIR}/AndroidManifest.xml - -D NAME=ANDROID_VERSION_INT - -D ANDROID_VERSION_NAME=${PACKAGE_STRING} - -D ANDROID_API_VERSION=${ANDROID_API_VERSION} - -D ANDROID_PERMISSIONS:string="${ANDROID_PERMISSIONS_EXPANDED}" - -D STRIP_M="1" - -P ${PROJECT_SOURCE_DIR}/cmake/version.cmake - ) + add_custom_command ( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/AndroidManifest.xml + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml.cmake + COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml.cmake + -D DST=${CMAKE_CURRENT_BINARY_DIR}/AndroidManifest.xml + -D NAME=ANDROID_VERSION_INT + -D ANDROID_VERSION_NAME=${PACKAGE_STRING} + -D ANDROID_API_VERSION=${ANDROID_API_VERSION} + -D ANDROID_PERMISSIONS:string="${ANDROID_PERMISSIONS_EXPANDED}" + -D STRIP_M="1" + -P ${PROJECT_SOURCE_DIR}/cmake/version.cmake + ) - add_custom_command ( - OUTPUT build.xml - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/AndroidManifest.xml ${SRC_FILES} - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - COMMAND android update project -t android-${ANDROID_API_VERSION} -p ${CMAKE_CURRENT_BINARY_DIR} - ) + add_custom_command ( + OUTPUT build.xml + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/AndroidManifest.xml ${SRC_FILES} + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} + COMMAND android update project -t android-${ANDROID_API_VERSION} -p ${CMAKE_CURRENT_BINARY_DIR} + ) - add_custom_target( android_resources - DEPENDS build.xml ${MODULES_NAME} ${NAVIT_SUPPORT_LIBS} ${LANG_RESOURCES} - COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res/raw/ - COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH} - COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_BINARY_DIR}/navit/libnavit.so ${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH}/ - COMMAND ${CMAKE_COMMAND} - -D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/navit*.xml" - -D DST=${CMAKE_CURRENT_BINARY_DIR}/res/raw - -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake - COMMAND ${CMAKE_COMMAND} - -D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/icons/*.png" - -D DST=${CMAKE_CURRENT_BINARY_DIR}/res/drawable-nodpi - -D LOWER=1 - -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake - COMMAND ${CMAKE_COMMAND} - -D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/*/*/.libs/lib[b-z]*.so" - -D DST=${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH} - -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake - COMMAND ${CMAKE_COMMAND} - -D GLOB_EXP="${PROJECT_BINARY_DIR}/po/*.mo" - -D DST=${CMAKE_CURRENT_BINARY_DIR}/res/raw - -D LOWER=1 - -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake - ) + add_custom_target( android_resources + DEPENDS build.xml ${MODULES_NAME} ${NAVIT_SUPPORT_LIBS} ${LANG_RESOURCES} + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/res/raw/ + COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH} + COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_BINARY_DIR}/navit/libnavit.so ${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH}/ + COMMAND ${CMAKE_COMMAND} + -D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/navit*.xml" + -D DST=${CMAKE_CURRENT_BINARY_DIR}/res/raw + -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake + COMMAND ${CMAKE_COMMAND} + -D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/icons/*.png" + -D DST=${CMAKE_CURRENT_BINARY_DIR}/res/drawable-nodpi + -D LOWER=1 + -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake + COMMAND ${CMAKE_COMMAND} + -D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/*/*/.libs/lib[b-z]*.so" + -D DST=${CMAKE_CURRENT_BINARY_DIR}/libs/${ANDROID_ARCH} + -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake + COMMAND ${CMAKE_COMMAND} + -D GLOB_EXP="${PROJECT_BINARY_DIR}/po/*.mo" + -D DST=${CMAKE_CURRENT_BINARY_DIR}/res/raw + -D LOWER=1 + -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake + ) - add_dependencies (android_resources images locales ${NAVIT_LIBNAME}) + add_dependencies (android_resources images locales ${NAVIT_LIBNAME}) - add_custom_target ( apkg - COMMAND ant debug - ) + add_custom_target ( apkg + COMMAND ant debug + ) - add_custom_target ( apkg-release - COMMAND ant release - ) + add_custom_target ( apkg-release + COMMAND ant release + ) - add_dependencies(apkg android_resources) - add_dependencies(apkg-release android_resources) + add_dependencies(apkg android_resources) + add_dependencies(apkg-release android_resources) endif(ANDROID AND NOT ${CMAKE_GENERATOR} STREQUAL Ninja) diff --git a/navit/binding/dbus/CMakeLists.txt b/navit/binding/dbus/CMakeLists.txt index ad6858346..b6378da14 100644 --- a/navit/binding/dbus/CMakeLists.txt +++ b/navit/binding/dbus/CMakeLists.txt @@ -2,9 +2,9 @@ module_add_library(binding_dbus binding_dbus.c) set(bindir ${CMAKE_INSTALL_PREFIX}/${BIN_DIR}) configure_file ( - "${CMAKE_CURRENT_SOURCE_DIR}/org.navit_project.navit.service.in" - "${CMAKE_CURRENT_BINARY_DIR}/org.navit_project.navit.service" -) + "${CMAKE_CURRENT_SOURCE_DIR}/org.navit_project.navit.service.in" + "${CMAKE_CURRENT_BINARY_DIR}/org.navit_project.navit.service" + ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.navit_project.navit.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/services/) diff --git a/navit/binding/win32/CMakeLists.txt b/navit/binding/win32/CMakeLists.txt index 710a4dcf6..37b675873 100644 --- a/navit/binding/win32/CMakeLists.txt +++ b/navit/binding/win32/CMakeLists.txt @@ -1,5 +1,5 @@ if (USE_LIBGNUINTL AND NOT HAVE_GLIB) - ADD_DEPENDENCIES(support_glib intl_cmake) + ADD_DEPENDENCIES(support_glib intl_cmake) endif() module_add_library(binding_win32 binding_win32.c) diff --git a/navit/font/freetype/CMakeLists.txt b/navit/font/freetype/CMakeLists.txt index 88470e8ff..c8c945e68 100644 --- a/navit/font/freetype/CMakeLists.txt +++ b/navit/font/freetype/CMakeLists.txt @@ -1,15 +1,15 @@ module_add_library(font_freetype font_freetype.c) if (FRIBIDI_FOUND) - include_directories(${FRIBIDI_INCLUDE_DIRS}) - set_property( - TARGET font_freetype - APPEND PROPERTY COMPILE_DEFINITIONS USE_FRIBIDI=1 - ) - if (NOT FRIBIDI2_FOUND) - set_property( - TARGET font_freetype - APPEND PROPERTY COMPILE_DEFINITIONS FRIBIDIOLD=1 - ) - endif (NOT FRIBIDI2_FOUND) + include_directories(${FRIBIDI_INCLUDE_DIRS}) + set_property( + TARGET font_freetype + APPEND PROPERTY COMPILE_DEFINITIONS USE_FRIBIDI=1 + ) + if (NOT FRIBIDI2_FOUND) + set_property( + TARGET font_freetype + APPEND PROPERTY COMPILE_DEFINITIONS FRIBIDIOLD=1 + ) + endif (NOT FRIBIDI2_FOUND) endif (FRIBIDI_FOUND) diff --git a/navit/fonts/CMakeLists.txt b/navit/fonts/CMakeLists.txt index 28dedecd1..69fb716f3 100644 --- a/navit/fonts/CMakeLists.txt +++ b/navit/fonts/CMakeLists.txt @@ -1,13 +1,13 @@ add_custom_target( fonts ALL DEPENDS ${NAVIT_FONTS} - COMMAND ${CMAKE_COMMAND} - -D GLOB_EXP="${CMAKE_CURRENT_SOURCE_DIR}/*.ttf" #${NAVIT_FONTS}" - -D DST=${CMAKE_CURRENT_BINARY_DIR} - -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake -) + COMMAND ${CMAKE_COMMAND} + -D GLOB_EXP="${CMAKE_CURRENT_SOURCE_DIR}/*.ttf" #${NAVIT_FONTS}" + -D DST=${CMAKE_CURRENT_BINARY_DIR} + -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake + ) FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.ttf") install( - FILES ${files} - DESTINATION ${SHARE_DIR}/fonts - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -) + FILES ${files} + DESTINATION ${SHARE_DIR}/fonts + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) diff --git a/navit/graphics/CMakeLists.txt b/navit/graphics/CMakeLists.txt index 004accfc8..9e77d361d 100644 --- a/navit/graphics/CMakeLists.txt +++ b/navit/graphics/CMakeLists.txt @@ -4,8 +4,8 @@ add_subdirectory (ezxml) if (HAVE_API_WIN32_BASE) -add_subdirectory (glib) -add_subdirectory (win32) + add_subdirectory (glib) + add_subdirectory (win32) endif (HAVE_API_WIN32_BASE) add_subdirectory (zlib) diff --git a/navit/graphics/cocoa/CMakeLists.txt b/navit/graphics/cocoa/CMakeLists.txt index a4cd31d84..6e7d21e4a 100644 --- a/navit/graphics/cocoa/CMakeLists.txt +++ b/navit/graphics/cocoa/CMakeLists.txt @@ -1,6 +1,6 @@ if (USE_UIKIT) -set(graphics_cocoa_LIBS "-framework Foundation" "-framework UIKit" "-framework CoreGraphics" "-liconv") + set(graphics_cocoa_LIBS "-framework Foundation" "-framework UIKit" "-framework CoreGraphics" "-liconv") else() -set(graphics_cocoa_LIBS "-framework Cocoa" "-liconv") + set(graphics_cocoa_LIBS "-framework Cocoa" "-liconv") endif() module_add_library(graphics_cocoa graphics_cocoa.m) diff --git a/navit/graphics/opengl/CMakeLists.txt b/navit/graphics/opengl/CMakeLists.txt index 1b408e023..382be14c7 100644 --- a/navit/graphics/opengl/CMakeLists.txt +++ b/navit/graphics/opengl/CMakeLists.txt @@ -1,6 +1,6 @@ set(graphics_opengl_SOURCES graphics_opengl.c) if (USE_OPENGLES) - LIST(APPEND graphics_opengl_SOURCES graphics_opengl_x11.c graphics_opengl_egl.c) + LIST(APPEND graphics_opengl_SOURCES graphics_opengl_x11.c graphics_opengl_egl.c) endif (USE_OPENGLES) module_add_library(graphics_opengl ${graphics_opengl_SOURCES}) diff --git a/navit/graphics/qt5/CMakeLists.txt b/navit/graphics/qt5/CMakeLists.txt index ff359e88f..0ba6dbc62 100644 --- a/navit/graphics/qt5/CMakeLists.txt +++ b/navit/graphics/qt5/CMakeLists.txt @@ -15,20 +15,20 @@ set(HAVE_FREETYPE 0) # check if we have FREETYPE if(font/freetype) - set(HAVE_FREETYPE 1) + set(HAVE_FREETYPE 1) endif() # check if we have QML if(USE_QML) - set(QML 1) - qt5_add_resources(QT5_QRC "graphics_qt5.qrc") - set(GRAPHICS_QT5_ADDITIONAL ${GRAPHICS_QT5_ADDITIONAL} "QNavitQuick.cpp" ${QT5_QRC}) + set(QML 1) + qt5_add_resources(QT5_QRC "graphics_qt5.qrc") + set(GRAPHICS_QT5_ADDITIONAL ${GRAPHICS_QT5_ADDITIONAL} "QNavitQuick.cpp" ${QT5_QRC}) endif () #check if we have QWIDGET if(USE_QWIDGET) - set(QWIDGET 1) - set(GRAPHICS_QT5_ADDITIONAL ${GRAPHICS_QT5_ADDITIONAL} "QNavitWidget.cpp") + set(QWIDGET 1) + set(GRAPHICS_QT5_ADDITIONAL ${GRAPHICS_QT5_ADDITIONAL} "QNavitWidget.cpp") endif () module_add_library(graphics_qt5 graphics_qt5.cpp event_qt5.cpp ${GRAPHICS_QT5_ADDITIONAL}) diff --git a/navit/gui/qml/CMakeLists.txt b/navit/gui/qml/CMakeLists.txt index 05456d9bd..4f2f4a8ce 100644 --- a/navit/gui/qml/CMakeLists.txt +++ b/navit/gui/qml/CMakeLists.txt @@ -11,13 +11,13 @@ QT4_GENERATE_MOC(guiProxy.h ${CMAKE_CURRENT_BINARY_DIR}/guiProxy.moc) QT4_GENERATE_MOC(routeProxy.h ${CMAKE_CURRENT_BINARY_DIR}/routeProxy.moc) QT4_GENERATE_MOC(gui_qml.cpp ${CMAKE_CURRENT_BINARY_DIR}/gui_qml.moc) module_add_library(gui_qml gui_qml.cpp - ${CMAKE_CURRENT_BINARY_DIR}/proxy.moc - ${CMAKE_CURRENT_BINARY_DIR}/ngqpoint.moc - ${CMAKE_CURRENT_BINARY_DIR}/searchProxy.moc - ${CMAKE_CURRENT_BINARY_DIR}/bookmarksProxy.moc - ${CMAKE_CURRENT_BINARY_DIR}/vehicleProxy.moc - ${CMAKE_CURRENT_BINARY_DIR}/navitProxy.moc - ${CMAKE_CURRENT_BINARY_DIR}/guiProxy.moc - ${CMAKE_CURRENT_BINARY_DIR}/routeProxy.moc - ${CMAKE_CURRENT_BINARY_DIR}/gui_qml.moc -) + ${CMAKE_CURRENT_BINARY_DIR}/proxy.moc + ${CMAKE_CURRENT_BINARY_DIR}/ngqpoint.moc + ${CMAKE_CURRENT_BINARY_DIR}/searchProxy.moc + ${CMAKE_CURRENT_BINARY_DIR}/bookmarksProxy.moc + ${CMAKE_CURRENT_BINARY_DIR}/vehicleProxy.moc + ${CMAKE_CURRENT_BINARY_DIR}/navitProxy.moc + ${CMAKE_CURRENT_BINARY_DIR}/guiProxy.moc + ${CMAKE_CURRENT_BINARY_DIR}/routeProxy.moc + ${CMAKE_CURRENT_BINARY_DIR}/gui_qml.moc + ) diff --git a/navit/icons/CMakeLists.txt b/navit/icons/CMakeLists.txt index 362d81d8d..9817aa25e 100644 --- a/navit/icons/CMakeLists.txt +++ b/navit/icons/CMakeLists.txt @@ -1,74 +1,74 @@ macro(convert_to_png IMAGE_INPUT IMAGE_OUTPUT SCALE) - get_filename_component(FILE_EXT ${IMAGE_INPUT} EXT) - string(TOUPPER ${FILE_EXT} FILE_TYPE) - string(REGEX REPLACE "^\\." "" FILE_TYPE ${FILE_TYPE}) - if(${IMAGE_CONVERTER_${FILE_TYPE}} MATCHES "rsvg-convert") - if (${SCALE} GREATER 0) - set(SCALE_ARGS --width=${SCALE} --height=${SCALE}) - else() - set(SCALE_ARGS) - endif() - set(COMMAND_ARGS ${SCALE_ARGS} --output ${IMAGE_OUTPUT} ${IMAGE_INPUT}) - elseif(${IMAGE_CONVERTER_${FILE_TYPE}} MATCHES "convert") - if (${SCALE} GREATER 0) - set(SCALE_ARGS -resize ${SCALE}x${SCALE}) - else() - set(SCALE_ARGS) - endif() - set(COMMAND_ARGS -background none ${IMAGE_INPUT} ${SCALE_ARGS} ${IMAGE_OUTPUT}) - elseif(${IMAGE_CONVERTER_${FILE_TYPE}} MATCHES "ksvgtopng") - set (NEW_SCALE ${SCALE}) - if (${SCALE} EQUAL 0) - file(STRINGS ${IMAGE_INPUT} NEW_SCALE_LINE REGEX "[^-]width=\"[0-9pxt.]*\"") - string(REGEX MATCH "width=\"([0-9]*)[pxt]*\"" NEW_SCALE_LINE ${NEW_SCALE_LINE}) - set(NEW_SCALE ${CMAKE_MATCH_1}) - endif() - set(COMMAND_ARGS ${NEW_SCALE} ${NEW_SCALE} ${IMAGE_INPUT} ${IMAGE_OUTPUT}) - elseif(${IMAGE_CONVERTER_${FILE_TYPE}} MATCHES "inkscape") - if (${SCALE} GREATER 0) - set(SCALE_ARGS --export-width=${SCALE} --export-height=${SCALE}) - else() - set(SCALE_ARGS) - endif() - set(COMMAND_ARGS --without-gui --export-background-opacity=0 --export-png ${IMAGE_OUTPUT} ${SCALE_ARGS} ${IMAGE_INPUT}) - else() - message(FATAL_ERROR "no svg2png converter defined here.") - endif() + get_filename_component(FILE_EXT ${IMAGE_INPUT} EXT) + string(TOUPPER ${FILE_EXT} FILE_TYPE) + string(REGEX REPLACE "^\\." "" FILE_TYPE ${FILE_TYPE}) + if(${IMAGE_CONVERTER_${FILE_TYPE}} MATCHES "rsvg-convert") + if (${SCALE} GREATER 0) + set(SCALE_ARGS --width=${SCALE} --height=${SCALE}) + else() + set(SCALE_ARGS) + endif() + set(COMMAND_ARGS ${SCALE_ARGS} --output ${IMAGE_OUTPUT} ${IMAGE_INPUT}) + elseif(${IMAGE_CONVERTER_${FILE_TYPE}} MATCHES "convert") + if (${SCALE} GREATER 0) + set(SCALE_ARGS -resize ${SCALE}x${SCALE}) + else() + set(SCALE_ARGS) + endif() + set(COMMAND_ARGS -background none ${IMAGE_INPUT} ${SCALE_ARGS} ${IMAGE_OUTPUT}) + elseif(${IMAGE_CONVERTER_${FILE_TYPE}} MATCHES "ksvgtopng") + set (NEW_SCALE ${SCALE}) + if (${SCALE} EQUAL 0) + file(STRINGS ${IMAGE_INPUT} NEW_SCALE_LINE REGEX "[^-]width=\"[0-9pxt.]*\"") + string(REGEX MATCH "width=\"([0-9]*)[pxt]*\"" NEW_SCALE_LINE ${NEW_SCALE_LINE}) + set(NEW_SCALE ${CMAKE_MATCH_1}) + endif() + set(COMMAND_ARGS ${NEW_SCALE} ${NEW_SCALE} ${IMAGE_INPUT} ${IMAGE_OUTPUT}) + elseif(${IMAGE_CONVERTER_${FILE_TYPE}} MATCHES "inkscape") + if (${SCALE} GREATER 0) + set(SCALE_ARGS --export-width=${SCALE} --export-height=${SCALE}) + else() + set(SCALE_ARGS) + endif() + set(COMMAND_ARGS --without-gui --export-background-opacity=0 --export-png ${IMAGE_OUTPUT} ${SCALE_ARGS} ${IMAGE_INPUT}) + else() + message(FATAL_ERROR "no svg2png converter defined here.") + endif() - add_custom_command ( - OUTPUT ${IMAGE_OUTPUT} - DEPENDS ${IMAGE_INPUT} - COMMAND ${IMAGE_CONVERTER_${FILE_TYPE}} ${COMMAND_ARGS} - ) + add_custom_command ( + OUTPUT ${IMAGE_OUTPUT} + DEPENDS ${IMAGE_INPUT} + COMMAND ${IMAGE_CONVERTER_${FILE_TYPE}} ${COMMAND_ARGS} + ) endmacro() macro(add_scale_targets IMAGE_SRC IMAGE_NAME) - string(REPLACE "," ";" SCALES "${ARGN}") - set(add_scale_targets_is_first_scale 1) - foreach (CURRENT_SCALE ${SCALES}) - if(add_scale_targets_is_first_scale EQUAL 1) - set (IMAGE_DST ${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_NAME}.png) - set(add_scale_targets_is_first_scale 0) - elseif (${CURRENT_SCALE} EQUAL 0) - set (IMAGE_DST ${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_NAME}.png) - message_error( "Image size value of 0 to leave image unscaled can only be given as the first value in row, e.g. -D svg2png_scaling=0,16,32 " ) - else() - set (IMAGE_DST ${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_NAME}_${CURRENT_SCALE}_${CURRENT_SCALE}.png) - endif() + string(REPLACE "," ";" SCALES "${ARGN}") + set(add_scale_targets_is_first_scale 1) + foreach (CURRENT_SCALE ${SCALES}) + if(add_scale_targets_is_first_scale EQUAL 1) + set (IMAGE_DST ${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_NAME}.png) + set(add_scale_targets_is_first_scale 0) + elseif (${CURRENT_SCALE} EQUAL 0) + set (IMAGE_DST ${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_NAME}.png) + message_error( "Image size value of 0 to leave image unscaled can only be given as the first value in row, e.g. -D svg2png_scaling=0,16,32 " ) + else() + set (IMAGE_DST ${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_NAME}_${CURRENT_SCALE}_${CURRENT_SCALE}.png) + endif() - if(NOT CURRENT_SCALE EQUAL -1) - convert_to_png( - ${CMAKE_CURRENT_SOURCE_DIR}/${IMAGE_SRC} - ${IMAGE_DST} - ${CURRENT_SCALE} - ) - list(APPEND IMAGE_TARGETS ${IMAGE_DST}) - endif() - endforeach() + if(NOT CURRENT_SCALE EQUAL -1) + convert_to_png( + ${CMAKE_CURRENT_SOURCE_DIR}/${IMAGE_SRC} + ${IMAGE_DST} + ${CURRENT_SCALE} + ) + list(APPEND IMAGE_TARGETS ${IMAGE_DST}) + endif() + endforeach() endmacro() if(NOT DEFINED NAVIT_BINARY) - set(NAVIT_BINARY navit CACHE STRING "Navit binary name not defined") + set(NAVIT_BINARY navit CACHE STRING "Navit binary name not defined") endif() #patch binary name in desktop file configure_file(desktop_icons/navit.desktop.in desktop_icons/${PACKAGE}.desktop) @@ -81,59 +81,59 @@ install(FILES desktop_icons/256x256/navit.png DESTINATION share/icons/hicolor/2 #install(FILES bench.xpm DESTINATION ) if (USE_SVG OR SVG2PNG) - FILE(GLOB SVG_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.svg" "*.svgz") + FILE(GLOB SVG_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.svg" "*.svgz") - if(USE_SVG) - list(APPEND IMAGES_TO_COPY ${SVG_FILES}) - endif(USE_SVG) - if(SVG2PNG) - list(APPEND FILES_TO_PNG ${SVG_FILES}) - endif(SVG2PNG) + if(USE_SVG) + list(APPEND IMAGES_TO_COPY ${SVG_FILES}) + endif(USE_SVG) + if(SVG2PNG) + list(APPEND FILES_TO_PNG ${SVG_FILES}) + endif(SVG2PNG) endif() FILE(GLOB XPM_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.xpm") if(XPM2PNG) - foreach (IMAGE_SRC ${SVG_FILES}) - string(REGEX REPLACE ".[a-z]*\$" "" IMAGE ${IMAGE_SRC}) - list(APPEND SVG_FILES_BASENAMES ${IMAGE}) - endforeach() - foreach (IMAGE_SRC ${XPM_FILES}) - string(REGEX REPLACE ".[a-z]*\$" "" IMAGE ${IMAGE_SRC}) - list(FIND SVG_FILES_BASENAMES ${IMAGE} DUP_IMG) - if ( ${DUP_IMG} LESS 0 ) - list(APPEND FILES_TO_PNG ${IMAGE_SRC}) - else() - message(STATUS "image '${IMAGE}': XPM version skipped in favor of SVG") - endif() - endforeach() + foreach (IMAGE_SRC ${SVG_FILES}) + string(REGEX REPLACE ".[a-z]*\$" "" IMAGE ${IMAGE_SRC}) + list(APPEND SVG_FILES_BASENAMES ${IMAGE}) + endforeach() + foreach (IMAGE_SRC ${XPM_FILES}) + string(REGEX REPLACE ".[a-z]*\$" "" IMAGE ${IMAGE_SRC}) + list(FIND SVG_FILES_BASENAMES ${IMAGE} DUP_IMG) + if ( ${DUP_IMG} LESS 0 ) + list(APPEND FILES_TO_PNG ${IMAGE_SRC}) + else() + message(STATUS "image '${IMAGE}': XPM version skipped in favor of SVG") + endif() + endforeach() else() - list(APPEND IMAGES_TO_COPY ${XPM_FILES}) + list(APPEND IMAGES_TO_COPY ${XPM_FILES}) endif(XPM2PNG) foreach (IMAGE_SRC ${FILES_TO_PNG}) - string(REGEX REPLACE ".[a-z]*\$" "" IMAGE ${IMAGE_SRC}) + string(REGEX REPLACE ".[a-z]*\$" "" IMAGE ${IMAGE_SRC}) - if ( IMAGE_SRC MATCHES ".*svgz*" ) - if ( DEFINED svg2png_scaling_nav AND ${IMAGE} MATCHES "^nav_") - add_scale_targets(${IMAGE_SRC} ${IMAGE} ${svg2png_scaling_nav}) - elseif( DEFINED svg2png_scaling_flag AND ${IMAGE} MATCHES "^country_") - add_scale_targets(${IMAGE_SRC} ${IMAGE} ${svg2png_scaling_flag}) - elseif( DEFINED svg2png_scaling) - add_scale_targets(${IMAGE_SRC} ${IMAGE} ${svg2png_scaling}) - endif() - else() - add_scale_targets(${IMAGE_SRC} ${IMAGE} 0) - endif() + if ( IMAGE_SRC MATCHES ".*svgz*" ) + if ( DEFINED svg2png_scaling_nav AND ${IMAGE} MATCHES "^nav_") + add_scale_targets(${IMAGE_SRC} ${IMAGE} ${svg2png_scaling_nav}) + elseif( DEFINED svg2png_scaling_flag AND ${IMAGE} MATCHES "^country_") + add_scale_targets(${IMAGE_SRC} ${IMAGE} ${svg2png_scaling_flag}) + elseif( DEFINED svg2png_scaling) + add_scale_targets(${IMAGE_SRC} ${IMAGE} ${svg2png_scaling}) + endif() + else() + add_scale_targets(${IMAGE_SRC} ${IMAGE} 0) + endif() endforeach() foreach (IMAGE_FILE ${IMAGES_TO_COPY}) - add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_FILE}" - DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${IMAGE_FILE}" - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/${IMAGE_FILE}" - "${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_FILE}" - ) - list(APPEND IMAGE_TARGETS "${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_FILE}") + add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_FILE}" + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${IMAGE_FILE}" + COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/${IMAGE_FILE}" + "${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_FILE}" + ) + list(APPEND IMAGE_TARGETS "${CMAKE_CURRENT_BINARY_DIR}/${IMAGE_FILE}") endforeach() add_custom_target(images ALL DEPENDS ${IMAGE_TARGETS}) @@ -141,7 +141,7 @@ add_custom_target(images_resource COMMAND mkdir -p ../resources/share/navit/xpm add_dependencies(images_resource images) install( - FILES ${IMAGE_TARGETS} - DESTINATION ${IMAGE_DIR} - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -) + FILES ${IMAGE_TARGETS} + DESTINATION ${IMAGE_DIR} + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) diff --git a/navit/map/garmin/CMakeLists.txt b/navit/map/garmin/CMakeLists.txt index b52c8c577..b60128a9c 100644 --- a/navit/map/garmin/CMakeLists.txt +++ b/navit/map/garmin/CMakeLists.txt @@ -4,9 +4,9 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}) # add the command to generate the source code add_custom_command ( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/g2nbuiltin.h - COMMAND gentypes ${CMAKE_CURRENT_SOURCE_DIR}/garmintypes.txt ${CMAKE_CURRENT_BINARY_DIR}/g2nbuiltin.h - DEPENDS gentypes - ) + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/g2nbuiltin.h + COMMAND gentypes ${CMAKE_CURRENT_SOURCE_DIR}/garmintypes.txt ${CMAKE_CURRENT_BINARY_DIR}/g2nbuiltin.h + DEPENDS gentypes + ) module_add_library(map_garmin garmin.c gar2navit.c g2nbuiltin.h) diff --git a/navit/maps/CMakeLists.txt b/navit/maps/CMakeLists.txt index c3f8ae7c4..3bd7a8f44 100644 --- a/navit/maps/CMakeLists.txt +++ b/navit/maps/CMakeLists.txt @@ -1,44 +1,44 @@ if(SAMPLE_MAP) - set(SAMPLE_MAP_NAME osm_bbox_11.3,47.9,11.7,48.2) - set(maptool_args "--attr-debug-level=5") + set(SAMPLE_MAP_NAME osm_bbox_11.3,47.9,11.7,48.2) + set(maptool_args "--attr-debug-level=5") - GET_TARGET_PROPERTY(MAPTOOL_PATH maptool LOCATION) - add_custom_target(sample_map ALL DEPENDS ${SAMPLE_MAP_NAME}.xml) - add_custom_command ( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.xml - COMMAND ${CMAKE_COMMAND} -D TYPE=binfile -D DATA=${SAMPLE_MAP_NAME}.bin - -D DST=${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.xml - -P ${PROJECT_SOURCE_DIR}/cmake/navit_writemapxml.cmake - VERBATIM - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin - ) - if(DOWNLOAD_SAMPLE_MAP) - add_custom_command ( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin - COMMAND ${CMAKE_COMMAND} - -D URL=http://www.navit-project.org/maps/${SAMPLE_MAP_NAME}.bin - -D DST=${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin - -P ${PROJECT_SOURCE_DIR}/cmake/navit_download.cmake - VERBATIM - ) - else() - add_custom_command ( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin - COMMAND bzcat ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2 - | ${MAPTOOL_PATH} ${maptool_args} ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin - VERBATIM - DEPENDS maptool ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2 - ) - add_custom_command ( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2 - COMMAND ${CMAKE_COMMAND} - -D URL=http://www.navit-project.org/maps/${SAMPLE_MAP_NAME}.osm.bz2 - -D DST=${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2 - -P ${PROJECT_SOURCE_DIR}/cmake/navit_download.cmake - VERBATIM - ) - endif() - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin - DESTINATION ${SHARE_DIR}/maps - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + GET_TARGET_PROPERTY(MAPTOOL_PATH maptool LOCATION) + add_custom_target(sample_map ALL DEPENDS ${SAMPLE_MAP_NAME}.xml) + add_custom_command ( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.xml + COMMAND ${CMAKE_COMMAND} -D TYPE=binfile -D DATA=${SAMPLE_MAP_NAME}.bin + -D DST=${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.xml + -P ${PROJECT_SOURCE_DIR}/cmake/navit_writemapxml.cmake + VERBATIM + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin + ) + if(DOWNLOAD_SAMPLE_MAP) + add_custom_command ( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin + COMMAND ${CMAKE_COMMAND} + -D URL=http://www.navit-project.org/maps/${SAMPLE_MAP_NAME}.bin + -D DST=${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin + -P ${PROJECT_SOURCE_DIR}/cmake/navit_download.cmake + VERBATIM + ) + else() + add_custom_command ( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin + COMMAND bzcat ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2 + | ${MAPTOOL_PATH} ${maptool_args} ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin + VERBATIM + DEPENDS maptool ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2 + ) + add_custom_command ( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2 + COMMAND ${CMAKE_COMMAND} + -D URL=http://www.navit-project.org/maps/${SAMPLE_MAP_NAME}.osm.bz2 + -D DST=${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.osm.bz2 + -P ${PROJECT_SOURCE_DIR}/cmake/navit_download.cmake + VERBATIM + ) + endif() + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SAMPLE_MAP_NAME}.bin + DESTINATION ${SHARE_DIR}/maps + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) endif() diff --git a/navit/maptool/CMakeLists.txt b/navit/maptool/CMakeLists.txt index e208eeea5..b9df91dd4 100644 --- a/navit/maptool/CMakeLists.txt +++ b/navit/maptool/CMakeLists.txt @@ -1,20 +1,20 @@ if(BUILD_MAPTOOL) - add_definitions( -DMODULE=maptool ${NAVIT_COMPILE_FLAGS}) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}) - SET(MAPTOOL_SOURCE boundaries.c buffer.c ch.c coastline.c itembin.c itembin_buffer.c misc.c osm.c osm_o5m.c osm_psql.c osm_relations.c sourcesink.c tempfile.c tile.c zip.c osm_xml.c) - if(NOT MSVC) - SET(MAPTOOL_SOURCE ${MAPTOOL_SOURCE} osm_protobuf.c osm_protobufdb.c generated-code/fileformat.pb-c.c generated-code/osmformat.pb-c.c google/protobuf-c/protobuf-c.c) - endif(NOT MSVC) - add_library (maptool_core ${MAPTOOL_SOURCE}) - add_executable (maptool maptool.c) - if(NOT MSVC) - SET(NAVIT_LIBS ${NAVIT_LIBS} m) - endif(NOT MSVC) - target_link_libraries(maptool maptool_core ${NAVIT_LIBNAME} ${NAVIT_LIBS}) + add_definitions( -DMODULE=maptool ${NAVIT_COMPILE_FLAGS}) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + SET(MAPTOOL_SOURCE boundaries.c buffer.c ch.c coastline.c itembin.c itembin_buffer.c misc.c osm.c osm_o5m.c osm_psql.c osm_relations.c sourcesink.c tempfile.c tile.c zip.c osm_xml.c) + if(NOT MSVC) + SET(MAPTOOL_SOURCE ${MAPTOOL_SOURCE} osm_protobuf.c osm_protobufdb.c generated-code/fileformat.pb-c.c generated-code/osmformat.pb-c.c google/protobuf-c/protobuf-c.c) + endif(NOT MSVC) + add_library (maptool_core ${MAPTOOL_SOURCE}) + add_executable (maptool maptool.c) + if(NOT MSVC) + SET(NAVIT_LIBS ${NAVIT_LIBS} m) + endif(NOT MSVC) + target_link_libraries(maptool maptool_core ${NAVIT_LIBNAME} ${NAVIT_LIBS}) - install(TARGETS maptool - DESTINATION ${BIN_DIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + install(TARGETS maptool + DESTINATION ${BIN_DIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) endif() diff --git a/navit/support/espeak/CMakeLists.txt b/navit/support/espeak/CMakeLists.txt index 6a20511e7..55f461a28 100644 --- a/navit/support/espeak/CMakeLists.txt +++ b/navit/support/espeak/CMakeLists.txt @@ -3,7 +3,7 @@ if(INTERNAL_ESPEAK_COMPLETE) set(ESPEAK_LIBRARY_ADDITIONAL speak_lib.c) endif() supportlib_add_library(support_espeak compiledict.c dictionary.c intonation.c readclause.c setlengths.c - numbers.c synth_mbrola.c synthdata.c synthesize.c translate.c tr_languages.c voices.c wavegen.c - phonemelist.c klatt.c speak_init.c ${ESPEAK_LIBRARY_ADDITIONAL}) + numbers.c synth_mbrola.c synthdata.c synthesize.c translate.c tr_languages.c voices.c wavegen.c + phonemelist.c klatt.c speak_init.c ${ESPEAK_LIBRARY_ADDITIONAL}) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/espeak-data DESTINATION ${SHARE_DIR} PATTERN ".svn" EXCLUDE) diff --git a/navit/support/glib/CMakeLists.txt b/navit/support/glib/CMakeLists.txt index 322d5467e..56d1ae8d3 100644 --- a/navit/support/glib/CMakeLists.txt +++ b/navit/support/glib/CMakeLists.txt @@ -1,3 +1,3 @@ supportlib_add_library(support_glib fake.c galiasdef.c gatomic.c gerror.c ghash.c - glib_init.c glist.c gmem.c gmessages.c gprimes.c gprintf.c gslice.c gslist.c - gstrfuncs.c gstring.c gutf8.c gutils.c) + glib_init.c glist.c gmem.c gmessages.c gprimes.c gprintf.c gslice.c gslist.c + gstrfuncs.c gstring.c gutf8.c gutils.c) diff --git a/navit/vehicle/gpsd/CMakeLists.txt b/navit/vehicle/gpsd/CMakeLists.txt index 091df2f71..75c3866c4 100644 --- a/navit/vehicle/gpsd/CMakeLists.txt +++ b/navit/vehicle/gpsd/CMakeLists.txt @@ -1,8 +1,8 @@ module_add_library(vehicle_gpsd vehicle_gpsd.c) if (LIBGPS19_FOUND) - set_property( - TARGET vehicle_gpsd - APPEND PROPERTY COMPILE_DEFINITIONS HAVE_LIBGPS19=1 - ) + set_property( + TARGET vehicle_gpsd + APPEND PROPERTY COMPILE_DEFINITIONS HAVE_LIBGPS19=1 + ) endif (LIBGPS19_FOUND) |