"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "CMakeLists.txt" between
navit-0.5.5.tar.gz and navit-0.5.6.tar.gz

About: NavIt is a car navigation system with GPS tracking and a routing engine.

[ To the main navit source changes report ]

CMakeLists.txt  (navit-0.5.5):CMakeLists.txt  (navit-0.5.6)
cmake_minimum_required(VERSION 3.2) cmake_minimum_required(VERSION 3.2)
set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.navitproject.navit") set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.navitproject.navit")
set(MACOSX_BUNDLE_BUNDLE_NAME "Navit") set(MACOSX_BUNDLE_BUNDLE_NAME "Navit")
message(STATUS "Building with CMake V${CMAKE_VERSION}") message(STATUS "Building with CMake V${CMAKE_VERSION}")
project(navit C) if (DISABLE_CXX)
project(navit C)
else(DISABLE_CXX)
project(navit C CXX)
endif(DISABLE_CXX)
# Workaround for CMake issue 8345 / 9220, see http://trac.navit-project.org/tick et/1041 # Workaround for CMake issue 8345 / 9220, see http://trac.navit-project.org/tick et/1041
if(DEFINED CMAKE_CXX_COMPILER AND CMAKE_CXX_COMPILER MATCHES "^$") if(DEFINED CMAKE_CXX_COMPILER AND CMAKE_CXX_COMPILER MATCHES "^$")
set(CMAKE_CXX_COMPILER CMAKE_CXX_COMPILER-NOTFOUND) set(CMAKE_CXX_COMPILER CMAKE_CXX_COMPILER-NOTFOUND)
endif(DEFINED CMAKE_CXX_COMPILER AND CMAKE_CXX_COMPILER MATCHES "^$") endif(DEFINED CMAKE_CXX_COMPILER AND CMAKE_CXX_COMPILER MATCHES "^$")
if (NOT DISABLE_CXX) if (NOT DISABLE_CXX)
enable_language(CXX OPTIONAL) enable_language(CXX OPTIONAL)
endif(NOT DISABLE_CXX) endif(NOT DISABLE_CXX)
set(NAVIT_VERSION_MAJOR "0") set(NAVIT_VERSION_MAJOR "0")
set(NAVIT_VERSION_MINOR "5") set(NAVIT_VERSION_MINOR "5")
set(NAVIT_VERSION_PATCH "5") set(NAVIT_VERSION_PATCH "6")
if(ANDROID) if(ANDROID)
set(PACKAGE_VERSION "${NAVIT_VERSION_MAJOR}.${NAVIT_VERSION_MINOR}.${NAVIT_V ERSION_PATCH}.${ANDROID_ABI}") set(PACKAGE_VERSION "${NAVIT_VERSION_MAJOR}.${NAVIT_VERSION_MINOR}.${NAVIT_V ERSION_PATCH}.${ANDROID_ABI}")
else(ANDROID) else(ANDROID)
set(PACKAGE_VERSION "${NAVIT_VERSION_MAJOR}.${NAVIT_VERSION_MINOR}.${NAVI T_VERSION_PATCH}") set(PACKAGE_VERSION "${NAVIT_VERSION_MAJOR}.${NAVIT_VERSION_MINOR}.${NAVI T_VERSION_PATCH}")
endif(ANDROID) endif(ANDROID)
set(PACKAGE_NAME "navit-git") set(PACKAGE_NAME "navit-git")
set(PACKAGE "navit" CACHE STRING "Navit package name") set(PACKAGE "navit" CACHE STRING "Navit package name")
set(PACKAGE_STRING "${PACKAGE} ${PACKAGE_VERSION}") set(PACKAGE_STRING "${PACKAGE} ${PACKAGE_VERSION}")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
skipping to change at line 106 skipping to change at line 110
add_plugin(support/gettext_intl "native libintl found" FALSE) add_plugin(support/gettext_intl "native libintl found" FALSE)
add_module(font/freetype "freetype not found" FALSE) add_module(font/freetype "freetype not found" FALSE)
add_module(graphics/android "FreeType library not found" FALSE) add_module(graphics/android "FreeType library not found" FALSE)
add_module(graphics/gd "FreeType library not found" FALSE) add_module(graphics/gd "FreeType library not found" FALSE)
add_module(graphics/gtk_drawing_area "FreeType library not found" FALSE) add_module(graphics/gtk_drawing_area "FreeType library not found" FALSE)
add_module(graphics/opengl "FreeType library not found" FALSE) add_module(graphics/opengl "FreeType library not found" FALSE)
add_module(graphics/sdl "Required library not found" FALSE) add_module(graphics/sdl "Required library not found" FALSE)
add_module(graphics/egl "Required library not found" FALSE) add_module(graphics/egl "Required library not found" FALSE)
add_module(graphics/qt_qpainter "Qt libraries not found" FALSE) add_module(graphics/qt_qpainter "Qt libraries not found" FALSE)
add_module(graphics/qt5 "Qt5 libraries not found" FALSE) add_module(graphics/qt5 "Qt5 libraries not found" FALSE)
add_module(graphics/svg_debug "native Glib not found" FALSE)
add_module(gui/qml "Qt Declarative not found" FALSE) add_module(gui/qml "Qt Declarative not found" FALSE)
add_module(gui/qt5_qml "Qt5 Declarative not found" FALSE) add_module(gui/qt5_qml "Qt5 Declarative not found" FALSE)
add_module(gui/gtk "GTK libs not found" FALSE) add_module(gui/gtk "GTK libs not found" FALSE)
add_module(vehicle/geoclue "geoclue lib not found" FALSE)
add_module(vehicle/gpsd "gpsd lib not found" FALSE) add_module(vehicle/gpsd "gpsd lib not found" FALSE)
add_module(vehicle/gypsy "gypsy lib not found" FALSE) add_module(vehicle/gypsy "gypsy lib not found" FALSE)
add_module(vehicle/maemo "Default" FALSE) add_module(vehicle/maemo "Default" FALSE)
add_module(binding/win32 "Default" FALSE) add_module(binding/win32 "Default" FALSE)
add_module(binding/dbus "dbus-glib-1 not found" FALSE) add_module(binding/dbus "dbus-glib-1 not found" FALSE)
add_module(binding/python "python libraries not found" FALSE) add_module(binding/python "python libraries not found" FALSE)
add_module(speech/dbus "dbus-glib-1 not found" FALSE) add_module(speech/dbus "dbus-glib-1 not found" FALSE)
add_module(speech/cmdline "neither system() nor CreateProcess() found" FALSE) add_module(speech/cmdline "neither system() nor CreateProcess() found" FALSE)
add_module(speech/qt5_espeak "Qt5 multimedia not found" FALSE) add_module(speech/qt5_espeak "Qt5 multimedia not found" FALSE)
add_module(vehicle/gpsd_dbus "dbus-glib-1 not found" FALSE) add_module(vehicle/gpsd_dbus "dbus-glib-1 not found" FALSE)
skipping to change at line 156 skipping to change at line 162
endif(USE_NSIS) endif(USE_NSIS)
set(CPACK_PACKAGE_INSTALL_DIRECTORY Navit) set(CPACK_PACKAGE_INSTALL_DIRECTORY Navit)
endif(WIN32) endif(WIN32)
INCLUDE (CPack) INCLUDE (CPack)
INCLUDE (CheckIncludeFiles) INCLUDE (CheckIncludeFiles)
INCLUDE (CheckLibraryExists) INCLUDE (CheckLibraryExists)
INCLUDE (CheckFunctionExists) INCLUDE (CheckFunctionExists)
INCLUDE (CheckSymbolExists) INCLUDE (CheckSymbolExists)
if(ANDROID)
set(ENV{PKG_CONFIG_DIR} "")
set(ENV{PKG_CONFIG_LIBDIR} "${CMAKE_SYSROOT}/usr/lib/pkgconfig:${CMAKE_SY
SROOT}/usr/share/pkgconfig")
set(ENV{PKG_CONFIG_SYSROOT_DIR} ${CMAKE_SYSROOT})
endif(ANDROID)
################################ ################################
# pkg-config based detection # # pkg-config based detection #
################################ ################################
find_package(PkgConfig) find_package(PkgConfig)
if(PKG_CONFIG_FOUND) if(PKG_CONFIG_FOUND)
pkg_check_modules ( GMODULE gmodule-2.0 ) pkg_check_modules ( GMODULE gmodule-2.0 )
if (GMODULE_FOUND) if (GMODULE_FOUND)
set(HAVE_GMODULE 1) set(HAVE_GMODULE 1)
include_directories(${GMODULE_INCLUDE_DIRS}) include_directories(${GMODULE_INCLUDE_DIRS})
skipping to change at line 200 skipping to change at line 212
# Accept even old versions of libgps, because N810 uses an old version (s ee #1179). # Accept even old versions of libgps, because N810 uses an old version (s ee #1179).
pkg_check_modules(LIBGPS libgps) pkg_check_modules(LIBGPS libgps)
pkg_check_modules(LIBGPS19 libgps>=2.90) pkg_check_modules(LIBGPS19 libgps>=2.90)
# libgpsd<V3.1 is buggy if LC_ALL is set. # libgpsd<V3.1 is buggy if LC_ALL is set.
pkg_check_modules(LIBGPS_NEW libgps>=3.1) pkg_check_modules(LIBGPS_NEW libgps>=3.1)
pkg_check_modules(LIBGARMIN libgarmin) pkg_check_modules(LIBGARMIN libgarmin)
pkg_check_modules(IMLIB2 imlib2) pkg_check_modules(IMLIB2 imlib2)
if(IMLIB2_FOUND) if(IMLIB2_FOUND)
set(HAVE_IMLIB2 1) set(HAVE_IMLIB2 1)
endif(IMLIB2_FOUND) endif(IMLIB2_FOUND)
# Geoclue
pkg_check_modules ( GeoClue libgeoclue-2.0 )
if(GeoClue_FOUND)
include_directories(${GeoClue_INCLUDE_DIRS})
set_with_reason(vehicle/geoclue "libgeoclue found" TRUE ${GeoClue
_INCLUDE_DIRS})
endif(GeoClue_FOUND)
else(PKG_CONFIG_FOUND) else(PKG_CONFIG_FOUND)
set_with_reason(support/glib "Glib not found" TRUE ${INTL_LIBS}) set_with_reason(support/glib "Glib not found" TRUE ${INTL_LIBS})
endif(PKG_CONFIG_FOUND) endif(PKG_CONFIG_FOUND)
#find_package(Iconv) #find_package(Iconv)
#find_package(Gmodule) #find_package(Gmodule)
find_package(ZLIB) find_package(ZLIB)
find_package(Freetype) find_package(Freetype)
#find_library(SDL2MAIN SDL2) #find_library(SDL2MAIN SDL2)
#find_library(SDL2IMAGE SDL2_image) #find_library(SDL2IMAGE SDL2_image)
skipping to change at line 319 skipping to change at line 338
else(PNG_FOUND) else(PNG_FOUND)
message(STATUS "using internal libpng") message(STATUS "using internal libpng")
set_with_reason(support/libpng "native libpng missing" TRUE) set_with_reason(support/libpng "native libpng missing" TRUE)
endif(PNG_FOUND) endif(PNG_FOUND)
if (NOT HAVE_WORDEXP) if (NOT HAVE_WORDEXP)
message(STATUS "wordexp.h not found. use internal wordexp") message(STATUS "wordexp.h not found. use internal wordexp")
set_with_reason(support/wordexp "native wordexp missing" TRUE) set_with_reason(support/wordexp "native wordexp missing" TRUE)
endif() endif()
if (NOT GLIB2_FOUND) if (NOT GLIB2_FOUND)
set_with_reason(support/ezxml "Glib not found" TRUE) set_with_reason(support/ezxml "Glib not found" TRUE)
endif() else(NOT GLIB2_FOUND)
set_with_reason(graphics/svg_debug "Glib found" TRUE)
endif(NOT GLIB2_FOUND)
if(FREETYPE_FOUND) if(FREETYPE_FOUND)
pkg_check_modules(FRIBIDI fribidi) pkg_check_modules(FRIBIDI fribidi)
pkg_check_modules(FRIBIDI2 fribidi>=0.19.0) pkg_check_modules(FRIBIDI2 fribidi>=0.19.0)
include_directories(${FREETYPE_INCLUDE_DIRS}) include_directories(${FREETYPE_INCLUDE_DIRS})
set_with_reason(font/freetype "freetype found" TRUE "${FREETYPE_LIBRARY}; ${FONTCONFIG_LDFLAGS};${FRIBIDI_LIBRARIES}") set_with_reason(font/freetype "freetype found" TRUE "${FREETYPE_LIBRARY}; ${FONTCONFIG_LDFLAGS};${FRIBIDI_LIBRARIES}")
else(FREETYPE_FOUND) else(FREETYPE_FOUND)
MESSAGE("No freetype library found, graphics modules may not be available ") MESSAGE("No freetype library found, graphics modules may not be available ")
set_with_reason(graphics/android "FreeType library not found" FALSE) set_with_reason(graphics/android "FreeType library not found" FALSE)
set_with_reason(graphics/gd "FreeType library not found" FALSE) set_with_reason(graphics/gd "FreeType library not found" FALSE)
 End of changes. 7 change blocks. 
3 lines changed or deleted 26 lines changed or added
To the CMake Files section of the navit source changes report or the top of this page
Mainly generated by pkgdiff using rfcdiff
Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)