From: <wog...@us...> - 2011-05-26 19:15:26
|
Revision: 4502 http://navit.svn.sourceforge.net/navit/?rev=4502&view=rev Author: woglinde Date: 2011-05-26 19:15:20 +0000 (Thu, 26 May 2011) Log Message: ----------- Add:Build:Reenable speech/cmdline again for the internal glib, because it was fixed in revision 4470 Revision Links: -------------- http://navit.svn.sourceforge.net/navit/?rev=4470&view=rev Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-05-26 11:07:18 UTC (rev 4501) +++ trunk/navit/CMakeLists.txt 2011-05-26 19:15:20 UTC (rev 4502) @@ -55,7 +55,6 @@ add_module(speech/speech_dispatcher "speech_dispatcher lib not found" FALSE) add_module(autoload/osso "Default" FALSE) add_module(map/garmin "Garmin library not found" FALSE) -add_module(speech/cmdline "Default" TRUE) add_feature(ENABLE_NLS "default" TRUE) INCLUDE (CPack) @@ -133,8 +132,6 @@ list(APPEND NAVIT_LIBS ${Glib_LIBRARIES}) else(Glib_FOUND) set_with_reason(support/glib "Glib not found" TRUE ${INTL_LIBS}) - # speech/cmdline doesn't build with our glib anymore - set_with_reason(speech/cmdline "does not build with support/glib" FALSE) endif(Glib_FOUND) if (Gmodule_FOUND) set(HAVE_GMODULE 1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-06-27 20:39:00
|
Revision: 4544 http://navit.svn.sourceforge.net/navit/?rev=4544&view=rev Author: martin-s Date: 2011-06-27 20:38:54 +0000 (Mon, 27 Jun 2011) Log Message: ----------- Fix:Build:Put navit in bin directory for better cpack compatibility Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-06-27 20:30:34 UTC (rev 4543) +++ trunk/navit/CMakeLists.txt 2011-06-27 20:38:54 UTC (rev 4544) @@ -361,7 +361,7 @@ MESSAGE(STATUS "win32: SVGs may not be supported by every available graphics") endif(NOT graphics/qt_qpainter) - set(BIN_DIR ./) + set(BIN_DIR bin) set(SHARE_DIR ./) set(LOCALE_DIR locale) set(IMAGE_DIR xpm) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-06-29 10:12:58
|
Revision: 4554 http://navit.svn.sourceforge.net/navit/?rev=4554&view=rev Author: martin-s Date: 2011-06-29 10:12:51 +0000 (Wed, 29 Jun 2011) Log Message: ----------- Fix:Build:Include fonts after the correct installation directories have been set Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-06-29 09:33:43 UTC (rev 4553) +++ trunk/navit/CMakeLists.txt 2011-06-29 10:12:51 UTC (rev 4554) @@ -172,9 +172,6 @@ pkg_check_modules(FRIBIDI2 fribidi>=0.19.0) include_directories(${FREETYPE_INCLUDE_DIRS}) set_with_reason(font/freetype "freetype found" TRUE "${FREETYPE_LIBRARY};${FONTCONFIG_LIBRARIES};${FRIBIDI_LIBRARIES}") - if(NOT FONTCONFIG_FOUND) - add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/navit/fonts") - endif() else(FREETYPE_FOUND) MESSAGE("No freetype library found, graphics modules may not be available") set_with_reason(graphics/android "FreeType library not found" FALSE) @@ -449,6 +446,10 @@ endif(ANDROID) +if(FREETYPE_FOUND AND NOT FONTCONFIG_FOUND) + add_subdirectory( "${CMAKE_CURRENT_SOURCE_DIR}/navit/fonts") +endif() + # Image conversion find_program(IMAGE_CONVERTER NAMES convert) execute_process(COMMAND ${IMAGE_CONVERTER} -list format OUTPUT_VARIABLE CONVERT_FORMATS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aka...@us...> - 2011-07-01 08:19:30
|
Revision: 4560 http://navit.svn.sourceforge.net/navit/?rev=4560&view=rev Author: akashihi Date: 2011-07-01 08:19:24 +0000 (Fri, 01 Jul 2011) Log Message: ----------- Fix:build:Fixed map_garmin build Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-07-01 00:56:01 UTC (rev 4559) +++ trunk/navit/CMakeLists.txt 2011-07-01 08:19:24 UTC (rev 4560) @@ -242,7 +242,8 @@ endif(GYPSY_FOUND) if (LIBGARMIN_FOUND) - set_with_reason(map/garmin "Garmin library found" TRUE ${LIBGARMIN_LIBRARIES}) + include_directories(${LIBGARMIN_INCLUDE_DIRS}) + set_with_reason(map/garmin "Garmin library found" TRUE ${LIBGARMIN_LDFLAGS}) endif(LIBGARMIN_FOUND) if(DBusGLib_FOUND) @@ -576,7 +577,6 @@ if (GETTEXT_FOUND) add_subdirectory (po) - #install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/locale DESTINATION ${LOCALE_DIR}) endif(GETTEXT_FOUND) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aka...@us...> - 2011-07-01 10:10:51
|
Revision: 4562 http://navit.svn.sourceforge.net/navit/?rev=4562&view=rev Author: akashihi Date: 2011-07-01 10:10:45 +0000 (Fri, 01 Jul 2011) Log Message: ----------- Fix:build:Fixed locale files installation path Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-07-01 10:03:12 UTC (rev 4561) +++ trunk/navit/CMakeLists.txt 2011-07-01 10:10:45 UTC (rev 4562) @@ -18,7 +18,7 @@ # install path set(BIN_DIR bin) set(SHARE_DIR share/navit) -set(LOCALE_DIR share) +set(LOCALE_DIR share/locale) set(IMAGE_DIR share/navit/xpm) set(LIB_DIR lib) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aka...@us...> - 2011-07-01 10:16:01
|
Revision: 4563 http://navit.svn.sourceforge.net/navit/?rev=4563&view=rev Author: akashihi Date: 2011-07-01 10:15:54 +0000 (Fri, 01 Jul 2011) Log Message: ----------- Fix:build:CMake is not able to find QtDeclarative Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-07-01 10:10:45 UTC (rev 4562) +++ trunk/navit/CMakeLists.txt 2011-07-01 10:15:54 UTC (rev 4563) @@ -80,8 +80,7 @@ #Qt detection SET(QT_USE_QTSVG TRUE) SET(QT_USE_QTXML TRUE) -SET(QT_USE_QTDECLARATIVE TRUE) -find_package(Qt4 COMPONENTS QtCore QtGui QtXml QtDeclarative QtSvg OPTIONAL) +find_package(Qt4 COMPONENTS QtCore QtGui QtXml QtSvg OPTIONAL) #pkg-config based detection find_package(PkgConfig) if(PKG_CONFIG_FOUND) @@ -91,6 +90,7 @@ pkg_check_modules(LIBOSSO libosso) pkg_check_modules(LIBGPS19 libgps>=2.90) pkg_check_modules(LIBGARMIN libgarmin) + pkg_check_modules(QTDECLARATIVE QtDeclarative) endif(PKG_CONFIG_FOUND) #Simple checks CHECK_INCLUDE_FILES(wordexp.h HAVE_WORDEXP) @@ -190,8 +190,9 @@ include(${QT_USE_FILE}) set_with_reason(graphics/qt_qpainter "Qt libraries found" TRUE ${QT_LIBRARIES}) - if (QT_QTDECLARATIVE_FOUND AND QT_QTXML_FOUND) - set_with_reason(gui/qml "Qt Declarative found" TRUE ${QT_LIBRARIES}) + if (QTDECLARATIVE_FOUND AND QT_QTXML_FOUND) + include_directories(${QTDECLARATIVE_INCLUDE_DIRS}) + set_with_reason(gui/qml "Qt Declarative found" TRUE ${QTDECLARATIVE_LIBRARIES}) endif() if (QT_QTSVG_FOUND) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-07-05 13:14:20
|
Revision: 4579 http://navit.svn.sourceforge.net/navit/?rev=4579&view=rev Author: martin-s Date: 2011-07-05 13:14:14 +0000 (Tue, 05 Jul 2011) Log Message: ----------- Fix:Build:Avoid setting win32 stuff under wince Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-07-03 16:14:13 UTC (rev 4578) +++ trunk/navit/CMakeLists.txt 2011-07-05 13:14:14 UTC (rev 4579) @@ -396,7 +396,7 @@ set(XSLTS "windows;${XSLTS}" CACHE STRING "define a semicolon seperated list of XSLTs to process") endif() -if (WIN32) +if (WIN32 AND NOT WINCE) set(HAVE_API_WIN32 1) set(HAVE_STDINT_H 1) #set(BUILD_MAPTOOL FALSE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-07-06 09:00:54
|
Revision: 4591 http://navit.svn.sourceforge.net/navit/?rev=4591&view=rev Author: martin-s Date: 2011-07-06 09:00:45 +0000 (Wed, 06 Jul 2011) Log Message: ----------- Add:Build:Possibility to add include directories Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-07-06 00:09:02 UTC (rev 4590) +++ trunk/navit/CMakeLists.txt 2011-07-06 09:00:45 UTC (rev 4591) @@ -30,6 +30,10 @@ list(APPEND NAVIT_LIBS ${EXTRA_LIBS}) endif(EXTRA_LIBS) +if (EXTRA_INCLUDES) + include_directories(${EXTRA_INCLUDES}) +endif(EXTRA_INCLUDE) + ### Detect environment add_plugin(support/ezxml "native Glib found" FALSE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-07-06 21:06:25
|
Revision: 4592 http://navit.svn.sourceforge.net/navit/?rev=4592&view=rev Author: martin-s Date: 2011-07-06 21:06:19 +0000 (Wed, 06 Jul 2011) Log Message: ----------- Fix:Build:Typo Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-07-06 09:00:45 UTC (rev 4591) +++ trunk/navit/CMakeLists.txt 2011-07-06 21:06:19 UTC (rev 4592) @@ -32,7 +32,7 @@ if (EXTRA_INCLUDES) include_directories(${EXTRA_INCLUDES}) -endif(EXTRA_INCLUDE) +endif(EXTRA_INCLUDES) ### Detect environment This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aka...@us...> - 2011-07-08 12:14:17
|
Revision: 4600 http://navit.svn.sourceforge.net/navit/?rev=4600&view=rev Author: akashihi Date: 2011-07-08 12:14:11 +0000 (Fri, 08 Jul 2011) Log Message: ----------- Fix:build:Added building of speech_cmdline with cmake Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-07-08 10:32:35 UTC (rev 4599) +++ trunk/navit/CMakeLists.txt 2011-07-08 12:14:11 UTC (rev 4600) @@ -55,6 +55,7 @@ add_module(vehicle/maemo "Default" FALSE) add_module(binding/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(vehicle/gpsd_dbus "dbus-glib-1 not found" FALSE) add_module(speech/speech_dispatcher "speech_dispatcher lib not found" FALSE) add_module(autoload/osso "Default" FALSE) @@ -110,7 +111,10 @@ CHECK_INCLUDE_FILES(getopt.h HAVE_GETOPT_H) CHECK_INCLUDE_FILES(string.h HAVE_STRING_H) CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) +CHECK_SYMBOL_EXISTS(system stdlib.h HAVE_SYSTEM) +CHECK_SYMBOL_EXISTS(CreateProcess windows.h HAVE_CREATEPROCESS) + ### Configure build #Required libraries, supplied with navit if (NOT HAVE_LIBINTL) @@ -262,6 +266,14 @@ set_with_reason(speech/speech_dispatcher "speech_dispatcher lib found" TRUE speechd) endif(HAVE_LIBSPEECHD) +if (HAVE_SYSTEM) + set_with_reason(speech/cmdline "system() call is available" TRUE) +endif(HAVE_SYSTEM) + +if (HAVE_CREATEPROCESS) + set_with_reason(speech/cmdline "CreateProcess() call is available" TRUE) +endif(HAVE_CREATEPROCESS) + if (GETTEXT_FOUND) execute_process(COMMAND echo "<test/>" COMMAND xgettext -L glade - RESULT_VARIABLE GETTEXT_RET) if ("${GETTEXT_RET}" STREQUAL "0") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2011-07-10 22:35:24
|
Revision: 4621 http://navit.svn.sourceforge.net/navit/?rev=4621&view=rev Author: rikky Date: 2011-07-10 22:35:18 +0000 (Sun, 10 Jul 2011) Log Message: ----------- Fix:build/cmake:Silence saxon test output Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-07-10 22:34:49 UTC (rev 4620) +++ trunk/navit/CMakeLists.txt 2011-07-10 22:35:18 UTC (rev 4621) @@ -341,7 +341,7 @@ find_program(SAXON NAMES saxon saxon8 saxon-xslt saxonb-xslt) if(SAXON) execute_process(COMMAND ${SAXON} -snone ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test.xml ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test.xslt - RESULT_VARIABLE SAXON_ERROR) + RESULT_VARIABLE SAXON_ERROR ERROR_QUIET) if (NOT SAXON_ERROR) set (SAXON_OPTIONS -snone) endif() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-07-27 20:58:18
|
Revision: 4661 http://navit.svn.sourceforge.net/navit/?rev=4661&view=rev Author: martin-s Date: 2011-07-27 20:58:11 +0000 (Wed, 27 Jul 2011) Log Message: ----------- Fix:Build:Make c++ compiler optional Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-07-26 16:14:29 UTC (rev 4660) +++ trunk/navit/CMakeLists.txt 2011-07-27 20:58:11 UTC (rev 4661) @@ -1,5 +1,10 @@ -project(navit) +project(navit C) +if(DEFINED CMAKE_CXX_COMPILER AND CMAKE_CXX_COMPILER MATCHES "^$") + set(CMAKE_CXX_COMPILER CMAKE_CXX_COMPILER-NOTFOUND) +endif(DEFINED CMAKE_CXX_COMPILER AND CMAKE_CXX_COMPILER MATCHES "^$") +enable_language(CXX OPTIONAL) + cmake_minimum_required(VERSION 2.6) cmake_policy(VERSION 2.6) @@ -223,7 +228,7 @@ CHECK_LIBRARY_EXISTS(freeimage FreeImage_Load "" FREEIMAGE_FOUND) if (QUESOGLC_FOUND AND FREETYPE_FOUND) - if (OPENGL_FOUND AND OPENGL_GLU_FOUND AND OPENGL_INCLUDE_DIR AND FREEIMAGE_FOUND) + if (OPENGL_FOUND AND OPENGL_GLU_FOUND AND OPENGL_GLUT_FOUND AND OPENGL_INCLUDE_DIR AND FREEIMAGE_FOUND) message (STATUS "opengl found: ${OPENGL_gl_LIBRARY}") include_directories(${OPENGL_INCLUDE_DIR}) set_with_reason(graphics/opengl "Found OpenGL and Quesoglc" TRUE ${OPENGL_gl_LIBRARY};${OPENGL_glu_LIBRARY};${GLUT_glut_LIBRARY};freeimage) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-08-24 19:12:10
|
Revision: 4709 http://navit.svn.sourceforge.net/navit/?rev=4709&view=rev Author: martin-s Date: 2011-08-24 19:12:04 +0000 (Wed, 24 Aug 2011) Log Message: ----------- Fix:Build:Enable graphics_cocoa and vehicle_iphone when appropriate Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-08-24 19:11:17 UTC (rev 4708) +++ trunk/navit/CMakeLists.txt 2011-08-24 19:12:04 UTC (rev 4709) @@ -325,7 +325,7 @@ add_module(vehicle/android "Default" FALSE) add_module(vehicle/iphone "Default" FALSE) add_module(vehicle/wince "Default" FALSE) -add_module(graphics/cocoa "Default" FALSE "-lcocoa" ) +add_module(graphics/cocoa "Default" FALSE) # other features add_feature(USE_PLUGINS "default" TRUE) @@ -446,6 +446,10 @@ set_with_reason(vehicle/file "wince: currently broken" FALSE) set_with_reason(vehicle/wince "wince detected" TRUE) endif() +if (APPLE OR USE_UIKIT) + set_with_reason(vehicle/iphone "apple detected" TRUE) + set_with_reason(graphics/cocoa "apple detected" TRUE) +endif() set(LOCALEDIR "${LOCALE_DIR}/locale") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-09-02 19:29:05
|
Revision: 4749 http://navit.svn.sourceforge.net/navit/?rev=4749&view=rev Author: martin-s Date: 2011-09-02 19:28:59 +0000 (Fri, 02 Sep 2011) Log Message: ----------- Fix:Build:Set bundle identifier Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-09-02 19:28:22 UTC (rev 4748) +++ trunk/navit/CMakeLists.txt 2011-09-02 19:28:59 UTC (rev 4749) @@ -1,3 +1,4 @@ +set(MACOSX_BUNDLE_GUI_IDENTIFIER "Navit") project(navit C) if(DEFINED CMAKE_CXX_COMPILER AND CMAKE_CXX_COMPILER MATCHES "^$") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2011-09-06 19:25:08
|
Revision: 4764 http://navit.svn.sourceforge.net/navit/?rev=4764&view=rev Author: rikky Date: 2011-09-06 19:25:02 +0000 (Tue, 06 Sep 2011) Log Message: ----------- Fix:android:Fix for using plugins with API 3 (Android 1.5) Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-09-06 19:24:50 UTC (rev 4763) +++ trunk/navit/CMakeLists.txt 2011-09-06 19:25:02 UTC (rev 4764) @@ -468,6 +468,9 @@ endif(SAMPLE_MAP) if(ANDROID) + # for android API 3 compatiblity + SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,/data/data/org.navitproject.navit/lib/") + find_program(ANDROID_LOCATION NAMES android android.bat) find_program(ANT_LOCATION NAMES ant) if (NOT ANT_LOCATION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2011-09-07 20:50:39
|
Revision: 4769 http://navit.svn.sourceforge.net/navit/?rev=4769&view=rev Author: rikky Date: 2011-09-07 20:50:33 +0000 (Wed, 07 Sep 2011) Log Message: ----------- Fix:build/cmake:Add new saxon executable name "transform.exe" Modified Paths: -------------- trunk/navit/CMakeLists.txt Property Changed: ---------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-09-07 20:00:13 UTC (rev 4768) +++ trunk/navit/CMakeLists.txt 2011-09-07 20:50:33 UTC (rev 4769) @@ -353,7 +353,7 @@ add_feature(BUILD_MAPTOOL "default" TRUE) add_feature(XSL_PROCESSING "default" TRUE) -find_program(XSLT_PROCESSOR NAMES saxon saxon8 saxon-xslt saxonb-xslt xsltproc) +find_program(XSLT_PROCESSOR NAMES saxon saxon8 saxon-xslt saxonb-xslt xsltproc transform.exe) if(XSLT_PROCESSOR) execute_process(COMMAND ${XSLT_PROCESSOR} -snone ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test.xml ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test.xslt RESULT_VARIABLE SAXON_ERROR ERROR_QUIET) Property changes on: trunk/navit/CMakeLists.txt ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-09-30 13:59:53
|
Revision: 4819 http://navit.svn.sourceforge.net/navit/?rev=4819&view=rev Author: martin-s Date: 2011-09-30 13:59:46 +0000 (Fri, 30 Sep 2011) Log Message: ----------- Fix:Core:Option to skip qt detection Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-09-30 13:34:17 UTC (rev 4818) +++ trunk/navit/CMakeLists.txt 2011-09-30 13:59:46 UTC (rev 4819) @@ -92,10 +92,12 @@ find_package(Threads) libfind_pkg_check_modules(FONTCONFIG fontconfig) #Qt detection -SET(QT_USE_QTSVG TRUE) -SET(QT_USE_QTXML TRUE) -SET(QT_USE_QTDECLARATIVE TRUE) -find_package(Qt4 COMPONENTS QtCore QtGui QtXml QtDeclarative QtSvg OPTIONAL) +if (NOT DISABLE_QT) + SET(QT_USE_QTSVG TRUE) + SET(QT_USE_QTXML TRUE) + SET(QT_USE_QTDECLARATIVE TRUE) + find_package(Qt4 COMPONENTS QtCore QtGui QtXml QtDeclarative QtSvg OPTIONAL) +endif (NOT DISABLE_QT) #pkg-config based detection find_package(PkgConfig) if(PKG_CONFIG_FOUND) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-09-30 14:02:47
|
Revision: 4820 http://navit.svn.sourceforge.net/navit/?rev=4820&view=rev Author: martin-s Date: 2011-09-30 14:02:38 +0000 (Fri, 30 Sep 2011) Log Message: ----------- Fix:Build:Add missing package Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-09-30 13:59:46 UTC (rev 4819) +++ trunk/navit/CMakeLists.txt 2011-09-30 14:02:38 UTC (rev 4820) @@ -75,6 +75,7 @@ INCLUDE (CheckIncludeFiles) INCLUDE (CheckLibraryExists) INCLUDE (CheckFunctionExists) +INCLUDE (CheckSymbolExists) find_package(Glib) find_package(Gmodule) find_package(ZLIB) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-10-05 13:49:26
|
Revision: 4830 http://navit.svn.sourceforge.net/navit/?rev=4830&view=rev Author: martin-s Date: 2011-10-05 13:49:20 +0000 (Wed, 05 Oct 2011) Log Message: ----------- Fix:Build:Enable NLS on visual studio Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-10-04 18:24:51 UTC (rev 4829) +++ trunk/navit/CMakeLists.txt 2011-10-05 13:49:20 UTC (rev 4830) @@ -432,10 +432,8 @@ if(MSVC) set(HAVE_PRAGMA_PACK 1) add_plugin(support/xgetopt "Windows detected" TRUE) - set(ENABLE_NLS FALSE) - else(MSVC) - set(ENABLE_NLS TRUE) endif(MSVC) + set(ENABLE_NLS TRUE) enable_language(RC) set(XSLTS "windows;${XSLTS}" CACHE STRING "define a semicolon seperated list of XSLTs to process") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2012-03-04 16:36:39
|
Revision: 4964 http://navit.svn.sourceforge.net/navit/?rev=4964&view=rev Author: martin-s Date: 2012-03-04 16:36:33 +0000 (Sun, 04 Mar 2012) Log Message: ----------- Add:Build:Possibility to define extra library search path Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2012-03-04 16:35:26 UTC (rev 4963) +++ trunk/navit/CMakeLists.txt 2012-03-04 16:36:33 UTC (rev 4964) @@ -43,6 +43,10 @@ include_directories(${EXTRA_INCLUDES}) endif(EXTRA_INCLUDES) +if (EXTRA_LIBDIR) + link_directories(${EXTRA_LIBDIR}) +endif(EXTRA_LIBDIR) + ### Detect environment add_plugin(support/ezxml "native Glib found" FALSE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sl...@us...> - 2012-05-03 21:14:57
|
Revision: 5070 http://navit.svn.sourceforge.net/navit/?rev=5070&view=rev Author: sleske Date: 2012-05-03 20:00:17 +0000 (Thu, 03 May 2012) Log Message: ----------- Fix:gui_internal:Also create PNG sizes 16 & 96px, internal GUI needs them to avoid ugly scaling. Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2012-05-03 19:59:40 UTC (rev 5069) +++ trunk/navit/CMakeLists.txt 2012-05-03 20:00:17 UTC (rev 5070) @@ -366,7 +366,7 @@ add_feature(SAMPLE_MAP "default" TRUE) IF(NOT svg2png_scaling) - set(svg2png_scaling 0 32 48 64) + set(svg2png_scaling 0 16 32 48 64 96) ENDIF() IF(NOT svg2png_scaling_flag) set(svg2png_scaling_flag 32) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wor...@us...> - 2012-05-10 08:49:08
|
Revision: 5093 http://navit.svn.sourceforge.net/navit/?rev=5093&view=rev Author: worldcitizen Date: 2012-05-10 08:48:57 +0000 (Thu, 10 May 2012) Log Message: ----------- CMake correction. The library files are now installed in the correct directories for LINUX and UNIX lib for 32 bit systems and lib64 for 64 biis systems Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2012-05-09 18:59:16 UTC (rev 5092) +++ trunk/navit/CMakeLists.txt 2012-05-10 08:48:57 UTC (rev 5093) @@ -29,7 +29,30 @@ set(SHARE_DIR share/navit) set(LOCALE_DIR share/locale) set(IMAGE_DIR share/navit/xpm) -set(LIB_DIR lib) +# LIB_DIR +IF(UNIX AND NOT ANDROID) + IF (NOT LIBDIR) + MESSAGE(STATUS "LIBDIR variable is not defined. It will be autodetected now.") + MESSAGE(STATUS "You can set it manually with -DLIBDIR=<value>") + IF (NOT APPLE) + # check 64 bit + IF (CMAKE_SIZEOF_VOID_P EQUAL 4) + SET(LIB_DIR lib) + MESSAGE(STATUS " LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'") + ELSE (CMAKE_SIZEOF_VOID_P EQUAL 4) + SET(LIB_DIR lib64) + MESSAGE(STATUS " LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'") + ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4) + ELSE (NOT APPLE) + SET(LIB_DIR lib) + ENDIF (NOT APPLE) + ELSE (NOT LIBDIR) + GET_FILENAME_COMPONENT (LIB_DIR ${LIBDIR} NAME) + MESSAGE(STATUS " LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'") + ENDIF (NOT LIBDIR) +ELSE (UNIX AND NOT ANDROID) + SET(LIB_DIR lib) +ENDIF (UNIX AND NOT ANDROID) foreach(EXTRA_MODULE ${EXTRA_MODULES}) add_module(${EXTRA_MODULE} "extra module specified" TRUE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wor...@us...> - 2012-05-10 09:06:52
|
Revision: 5094 http://navit.svn.sourceforge.net/navit/?rev=5094&view=rev Author: worldcitizen Date: 2012-05-10 09:06:45 +0000 (Thu, 10 May 2012) Log Message: ----------- Improved CMake correction. The library files are now installed in the correct directories for LINUX and UNIX lib for 32 bit systems and lib64 for 64 biis systems Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2012-05-10 08:48:57 UTC (rev 5093) +++ trunk/navit/CMakeLists.txt 2012-05-10 09:06:45 UTC (rev 5094) @@ -30,22 +30,18 @@ set(LOCALE_DIR share/locale) set(IMAGE_DIR share/navit/xpm) # LIB_DIR -IF(UNIX AND NOT ANDROID) +IF(UNIX AND NOT ANDROID AND NOT APPLE) IF (NOT LIBDIR) MESSAGE(STATUS "LIBDIR variable is not defined. It will be autodetected now.") MESSAGE(STATUS "You can set it manually with -DLIBDIR=<value>") - IF (NOT APPLE) - # check 64 bit - IF (CMAKE_SIZEOF_VOID_P EQUAL 4) - SET(LIB_DIR lib) - MESSAGE(STATUS " LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'") - ELSE (CMAKE_SIZEOF_VOID_P EQUAL 4) - SET(LIB_DIR lib64) - MESSAGE(STATUS " LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'") - ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4) - ELSE (NOT APPLE) + # check 64 bit + IF (CMAKE_SIZEOF_VOID_P EQUAL 4) SET(LIB_DIR lib) - ENDIF (NOT APPLE) + MESSAGE(STATUS " LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'") + ELSE (CMAKE_SIZEOF_VOID_P EQUAL 4) + SET(LIB_DIR lib64) + MESSAGE(STATUS " LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'") + ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4) ELSE (NOT LIBDIR) GET_FILENAME_COMPONENT (LIB_DIR ${LIBDIR} NAME) MESSAGE(STATUS " LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wor...@us...> - 2012-05-10 09:10:59
|
Revision: 5095 http://navit.svn.sourceforge.net/navit/?rev=5095&view=rev Author: worldcitizen Date: 2012-05-10 09:10:48 +0000 (Thu, 10 May 2012) Log Message: ----------- Corrected missing info at ELSE and ENDIF. CMake correction. The library files are now installed in the correct directories for LINUX and UNIX lib for 32 bit systems and lib64 for 64 biis systems Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2012-05-10 09:06:45 UTC (rev 5094) +++ trunk/navit/CMakeLists.txt 2012-05-10 09:10:48 UTC (rev 5095) @@ -46,9 +46,9 @@ GET_FILENAME_COMPONENT (LIB_DIR ${LIBDIR} NAME) MESSAGE(STATUS " LIB_DIR (highest subdirectory if LIBDIR) is set to '${LIB_DIR}'") ENDIF (NOT LIBDIR) -ELSE (UNIX AND NOT ANDROID) +ELSE (UNIX AND NOT ANDROID AND NOT APPLE) SET(LIB_DIR lib) -ENDIF (UNIX AND NOT ANDROID) +ENDIF (UNIX AND NOT ANDROID AND NOT APPLE) foreach(EXTRA_MODULE ${EXTRA_MODULES}) add_module(${EXTRA_MODULE} "extra module specified" TRUE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2012-05-19 15:39:56
|
Revision: 5106 http://navit.svn.sourceforge.net/navit/?rev=5106&view=rev Author: martin-s Date: 2012-05-19 15:39:50 +0000 (Sat, 19 May 2012) Log Message: ----------- Fix:Build:Build correct turn icons Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2012-05-15 21:27:54 UTC (rev 5105) +++ trunk/navit/CMakeLists.txt 2012-05-19 15:39:50 UTC (rev 5106) @@ -391,7 +391,7 @@ set(svg2png_scaling_flag 32) ENDIF() IF(NOT svg2png_scaling_nav) - set(svg2png_scaling_nav 64) + set(svg2png_scaling_nav 64 64) ENDIF() add_feature(DBUS_USE_SYSTEM_BUS "default" FALSE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |