iOS build

.circleci/config.yml

@@ -262,7 +262,7 @@ jobs:
           command: mkdir -p ~/.ssh/ && ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
       - add_ssh_keys:
           fingerprints:
-            - "58:42:73:90:cc:68:f7:34:7e:37:37:fa:b3:26:1f:a5"
+            - "58:56:ba:cb:79:65:53:bc:9e:41:a2:fd:18:59:43:a2"
       - run:
           name: Update results to Github
           command: export GIT_TERMINAL_PROMPT=0 && git push origin $CIRCLE_SHA1:refs/heads/master

CMakeLists.txt

@@ -1,14 +1,25 @@
 cmake_minimum_required(VERSION 3.2)
-
 set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.navitproject.navit")
-set(MACOSX_BUNDLE_BUNDLE_NAME "Navit")
+set(MACOSX_BUNDLE_BUNDLE_NAME "navit")
+set(PRODUCT_BUNDLE_IDENTIFIER ${MACOSX_BUNDLE_GUI_IDENTIFIER})
+if(USE_UIKIT)
+	execute_process(COMMAND git describe --tags OUTPUT_VARIABLE GIT_VERSION)
+	string(STRIP ${GIT_VERSION} GIT_VERSION)
+endif(USE_UIKIT)
 message(STATUS "Building with CMake V${CMAKE_VERSION}")
+message(STATUS "GIT_VERSION is \"${GIT_VERSION}\"")
+
 if (DISABLE_CXX)
 	project(navit C)
 else(DISABLE_CXX)
 	project(navit C CXX)
 endif(DISABLE_CXX)
 
+if(USE_UIKIT)
+# Set the find root to the iOS developer roots
+    set (CMAKE_FIND_ROOT_PATH ${CMAKE_IOS_DEVELOPER_ROOT}/ ${CMAKE_IOS_SDK_ROOT}/ ${CMAKE_FIND_ROOT_PATH} CACHE STRING  "iOS find search path root")
+endif(USE_UIKIT)
+
 # Workaround for CMake issue 8345 / 9220, see http://trac.navit-project.org/ticket/1041
 if(DEFINED CMAKE_CXX_COMPILER AND CMAKE_CXX_COMPILER MATCHES "^$")
 	set(CMAKE_CXX_COMPILER CMAKE_CXX_COMPILER-NOTFOUND)
@@ -20,6 +31,7 @@ endif(NOT DISABLE_CXX)
 set(NAVIT_VERSION_MAJOR "0")
 set(NAVIT_VERSION_MINOR "5")
 set(NAVIT_VERSION_PATCH "6")
+
 if(ANDROID)
     set(PACKAGE_VERSION "${NAVIT_VERSION_MAJOR}.${NAVIT_VERSION_MINOR}.${NAVIT_VERSION_PATCH}.${ANDROID_ABI}")
 else(ANDROID)
@@ -263,11 +275,17 @@ if (NOT DISABLE_QT)
 endif (NOT DISABLE_QT)
 
 #Simple checks
-CHECK_INCLUDE_FILES(wordexp.h HAVE_WORDEXP)
+if(NOT USE_UIKIT) # Will be found but is not usable:
+                  # int wordexp(const char * __restrict, wordexp_t * __restrict, int) __OSX_AVAILABLE_STARTING(__MAC_10_0, __IPHONE_NA);
+                  # void wordfree(wordexp_t *) __OSX_AVAILABLE_STARTING(__MAC_10_0, __IPHONE_NA);
+    CHECK_INCLUDE_FILES(wordexp.h HAVE_WORDEXP)
+endif(NOT USE_UIKIT)
 CHECK_INCLUDE_FILES(endian.h HAVE_ENDIAN_H)
 CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H)
 CHECK_INCLUDE_FILES(byteswap.h HAVE_BYTESWAP_H)
-CHECK_LIBRARY_EXISTS(gypsy gypsy_control_get_default "" GYPSY_FOUND)
+if(NOT USE_UIKIT)
+    CHECK_LIBRARY_EXISTS(gypsy gypsy_control_get_default "" GYPSY_FOUND)
+endif(NOT USE_UIKIT)
 CHECK_INCLUDE_FILES(libspeechd.h HAVE_LIBSPEECHD)
 CHECK_INCLUDE_FILES(sys/socket.h HAVE_SOCKET)
 CHECK_INCLUDE_FILES(sys/shm.h HAVE_SHMEM)
@@ -283,6 +301,7 @@ CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL)
 CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H)
 CHECK_INCLUDE_FILES(getopt.h HAVE_GETOPT_H)
 CHECK_INCLUDE_FILES(string.h HAVE_STRING_H)
+CHECK_INCLUDE_FILES(stdlib.h HAVE_STDLIB_H)
 CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
 CHECK_SYMBOL_EXISTS(system stdlib.h HAVE_SYSTEM)
 CHECK_SYMBOL_EXISTS(CreateProcess windows.h HAVE_CREATEPROCESS)
@@ -509,6 +528,14 @@ if (GETTEXT_FOUND)
 	set_with_reason(USE_NATIVE_LANGUAGE_SUPPORT "Gettext found" TRUE)
 endif(GETTEXT_FOUND)
 
+if (USE_UIKIT)
+	set_with_reason(USE_NATIVE_LANGUAGE_SUPPORT "IOS found" TRUE)
+    set(XGETTEXT "/usr/local/bin/xgettext")
+    set(GETTEXT_MSGMERGE_EXECUTABLE "/usr/local/bin/msgmerge")
+    set(GETTEXT_MSGFMT_EXECUTABLE "/usr/local/bin/msgfmt")
+    add_compile_definitions(IOS )
+endif(USE_UIKIT)
+
 #Independent modules
 add_module(graphics/null "Default" TRUE)
 add_module(osd/core "Default" TRUE)
@@ -593,7 +620,11 @@ add_feature(BUILD_MAPTOOL "default" TRUE)
 add_feature(XSL_PROCESSING "default" TRUE)
 
 set(SUPPORTED_XSLT_PROCESSORS "saxonb-xslt;saxon;saxon8;saxon-xslt;xsltproc;transform.exe")
-find_program(XSLT_PROCESSOR NAMES ${SUPPORTED_XSLT_PROCESSORS})
+if (USE_UIKIT)
+    find_host_program(XSLT_PROCESSOR NAMES ${SUPPORTED_XSLT_PROCESSORS})
+else (USE_UIKIT)
+    find_program(XSLT_PROCESSOR NAMES ${SUPPORTED_XSLT_PROCESSORS})
+endif (USE_UIKIT)
 if(XSLT_PROCESSOR)
 	message(STATUS "Found XSLT processor: ${XSLT_PROCESSOR}")
 	execute_process(COMMAND ${XSLT_PROCESSOR} -snone ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test.xml ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test.xslt
@@ -707,18 +738,22 @@ endif()
 if (APPLE OR USE_UIKIT)
 	set_with_reason(vehicle/iphone "apple detected" TRUE)
 	set_with_reason(graphics/cocoa "apple detected" TRUE)
-	if (EXISTS "${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks/VoiceServices.framework")
+	if (USE_UIKIT)
 		set_with_reason(speech/iphone "apple detected" TRUE)
-	endif()
+	endif(USE_UIKIT)
 	set(BUILD_BUNDLE TRUE CACHE BOOLEAN "build an osx bundle")
-endif()
+endif(APPLE OR USE_UIKIT)
 
 if(CMAKE_SIZEOF_VOID_P LESS 8)
 	set_with_reason(BUILD_MAPTOOL "maptool works only on 64 bit architectures" FALSE)
 endif()
 
 if(BUILD_MAPTOOL)
-	find_package(Protobuf-c REQUIRED)
+	if(USE_UIKIT)
+                find_host_package(Protobuf-c REQUIRED)
+        else(USE_UIKIT)
+                find_package(Protobuf-c REQUIRED)
+        endif(USE_UIKIT)
 	if(NOT PROTOBUF_C_FOUND)
 		set_with_reason(BUILD_MAPTOOL "PROTOBUF-C not found" FALSE)
 	endif()
@@ -781,7 +816,11 @@ if(FREETYPE_FOUND AND NOT FONTCONFIG_FOUND)
 endif()
 
 # Image conversion
-find_program(IMAGE_CONVERTER NAMES convert)
+if (USE_UIKIT)
+    find_host_program(IMAGE_CONVERTER NAMES rsvg-convert)
+else (USE_UIKIT)
+    find_program(IMAGE_CONVERTER NAMES convert)
+endif (USE_UIKIT)
 execute_process(COMMAND ${IMAGE_CONVERTER} -list format OUTPUT_VARIABLE CONVERT_FORMATS)
 if(CONVERT_FORMATS MATCHES ".*XPM[ *][ ]*XPM[ ]*r[w-].*")
 	set(IMAGE_CONVERTER_XPM ${IMAGE_CONVERTER})
@@ -792,7 +831,11 @@ if (SVG2PNG)
 	if (NOT IMAGE_CONVERTER_SVGZ)
 		set (SVG_CONVERTER_PROGS rsvg-convert ksvgtopng ksvgtopng4 inkscape)
 		set (CMAKE_FIND_APPBUNDLE "NEVER")
-		find_program(IMAGE_CONVERTER_SVGZ NAMES ${SVG_CONVERTER_PROGS} PATHS /Applications/Inkscape.app/Contents/Resources/bin)
+        if (USE_UIKIT)
+            find_host_program(IMAGE_CONVERTER_SVGZ NAMES ${SVG_CONVERTER_PROGS})
+        else (USE_UIKIT)
+            find_program(IMAGE_CONVERTER_SVGZ NAMES ${SVG_CONVERTER_PROGS} PATHS /Applications/Inkscape.app/Contents/Resources/bin)
+        endif (USE_UIKIT)
 		if (NOT IMAGE_CONVERTER_SVGZ)
 			if(CONVERT_FORMATS MATCHES ".*[ ]*SVG[ ]*r[w-].*")
 				set(IMAGE_CONVERTER_SVGZ ${IMAGE_CONVERTER})
@@ -835,11 +878,18 @@ CHECK_INCLUDE_FILES ("sys/param.h;sys/mount.h" HAVE_SYS_MOUNT_H)
 CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H)
 CHECK_FUNCTION_EXISTS (getcwd HAVE_GETCWD)
 CHECK_FUNCTION_EXISTS (memalign HAVE_MEMALIGN)
+if(USE_UIKIT)
+    if(HAVE_MEMALIGN)
+        add_compile_definitions(POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS)
+    endif(HAVE_MEMALIGN)
+endif(USE_UIKIT)
 CHECK_FUNCTION_EXISTS (valloc HAVE_VALLOC)
 CHECK_FUNCTION_EXISTS (posix_memalign HAVE_POSIX_MEMALIGN)
 CHECK_FUNCTION_EXISTS (popen HAVE_POPEN)
-CHECK_FUNCTION_EXISTS (_atoi64 HAVE__ATOI64)
-
+if(NOT USE_UIKIT) #check_function_exists()`` only verifies linking, it does not verify
+#                  that the function is declared in system headers.
+    CHECK_FUNCTION_EXISTS (_atoi64 HAVE__ATOI64)
+endif(NOT USE_UIKIT)
 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
 			   "${CMAKE_CURRENT_BINARY_DIR}/config.h" )
 
@@ -854,7 +904,7 @@ add_compiler_flag_if_available("-Wall")
 add_compiler_flag_if_available("-Wno-unused-parameter")
 add_compiler_flag_if_available("-Wno-sign-compare")
 add_compiler_flag_if_available("-Wno-missing-field-initializers")
-add_compiler_flag_if_available("-Wundef")
+#add_compiler_flag_if_available("-Wundef")
 add_compiler_flag_if_available("-Wcast-align")
 add_compiler_flag_if_available("-Wpointer-arith")
 add_compiler_flag_if_available("-Wextra")
@@ -928,3 +978,53 @@ add_subdirectory (man)
 if (USE_NATIVE_LANGUAGE_SUPPORT)
 	add_subdirectory (po)
 endif(USE_NATIVE_LANGUAGE_SUPPORT)
+
+if (APPLE)
+    if(USE_UIKIT)
+        set_target_properties(${TARGET} PROPERTIES XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME "Launchicon")
+        set_target_properties(${TARGET} PROPERTIES XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME "AppIcon")
+        set(CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2 ")
+        set_xcode_property(navit UIRequiresFullScreen "YES")
+	set_xcode_property(navit PRODUCT_BUNDLE_IDENTIFIER ${MACOSX_BUNDLE_GUI_IDENTIFIER})
+    endif(USE_UIKIT)
+    SET_XCODE_PROPERTY(navit CODE_SIGN_IDENTITY ${CODE_SIGN_IDENTITY} )
+    message(STATUS "CODE_SIGN_IDENTITY: ${CODE_SIGN_IDENTITY}")
+    SET_XCODE_PROPERTY(navit DEVELOPMENT_TEAM ${DEVELOPMENT_TEAM_ID} )
+    message(STATUS "DEVELOPMENT_TEAM_ID: ${DEVELOPMENT_TEAM_ID}")
+endif (APPLE)
+
+function(get_all_targets var)
+    set(targets)
+    get_all_targets_recursive(targets ${CMAKE_CURRENT_SOURCE_DIR})
+    set(${var} ${targets} PARENT_SCOPE)
+endfunction()
+
+macro(get_all_targets_recursive targets dir)
+    get_property(subdirectories DIRECTORY ${dir} PROPERTY SUBDIRECTORIES)
+    foreach(subdir ${subdirectories})
+        get_all_targets_recursive(${targets} ${subdir})
+    endforeach()
+
+    get_property(current_targets DIRECTORY ${dir} PROPERTY BUILDSYSTEM_TARGETS)
+    list(APPEND ${targets} ${current_targets})
+endmacro()
+
+get_all_targets(all_targets)
+foreach (MYTARGET ${all_targets})
+    if(DEFINED IPHONEOS_DEPLOYMENT_TARGET)
+        set_target_properties(${MYTARGET} PROPERTIES XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${IPHONEOS_DEPLOYMENT_TARGET}")
+	set_target_properties(${MYTARGET} PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_WEAK "YES")
+    endif(DEFINED IPHONEOS_DEPLOYMENT_TARGET)
+endforeach()
+
+macro(print_all_variables)
+    message(STATUS "print_all_variables------------------------------------------{")
+    get_cmake_property(_variableNames VARIABLES)
+    foreach (_variableName ${_variableNames})
+        message(STATUS "${_variableName}=${${_variableName}}")
+    endforeach()
+    message(STATUS "print_all_variables------------------------------------------}")
+endmacro()
+
+# Useful for debugging the cmake scripts
+# print_all_variables()