From: <mar...@us...> - 2011-01-25 09:12:34
|
Revision: 4005 http://navit.svn.sourceforge.net/navit/?rev=4005&view=rev Author: martin-s Date: 2011-01-25 09:12:28 +0000 (Tue, 25 Jan 2011) Log Message: ----------- Fix:Build:MSVC Fixes|Thanks chollya Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-01-24 23:58:41 UTC (rev 4004) +++ trunk/navit/CMakeLists.txt 2011-01-25 09:12:28 UTC (rev 4005) @@ -241,7 +241,9 @@ add_module(gui/internal "Default" TRUE) add_module(map/binfile "Default" TRUE) add_module(map/filter "Default" TRUE) +if(NOT MSVC) add_module(map/mg "Default" TRUE) +endif(NOT MSVC) add_module(map/shapefile "Default" TRUE) add_module(map/textfile "Default" TRUE) add_module(map/csv "Default" TRUE) @@ -309,7 +311,7 @@ set(LOCALE_DIR ./) set(IMAGE_DIR xpm) - + if(HAVE_GTK2 AND NOT MSVC) #GTK requires special compile flags add_definitions("-mms-bitfields") @@ -321,7 +323,15 @@ if(HAVE_WINSOCK) list(APPEND NAVIT_LIBS ws2_32) endif(HAVE_WINSOCK) - + + if(MSVC) + add_plugin(support/xgetopt "Windows detected" TRUE) + else(MSVC) + set(ENABLE_NLS TRUE) + add_plugin(intl_cmake "windows detected" TRUE) + endif(MSVC) + + set(USE_LIBGNUINTL TRUE) endif() if (WIN32) set(HAVE_API_WIN32 1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-01-25 13:58:12
|
Revision: 4009 http://navit.svn.sourceforge.net/navit/?rev=4009&view=rev Author: martin-s Date: 2011-01-25 13:58:05 +0000 (Tue, 25 Jan 2011) Log Message: ----------- Fix:Build:Temporary disable intl_cmake on msvc Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-01-25 10:35:38 UTC (rev 4008) +++ trunk/navit/CMakeLists.txt 2011-01-25 13:58:05 UTC (rev 4009) @@ -328,12 +328,11 @@ if(MSVC) add_plugin(support/xgetopt "Windows detected" TRUE) + add_plugin(intl_cmake "not yet supported on msvc" FALSE) else(MSVC) set(ENABLE_NLS TRUE) - add_plugin(intl_cmake "windows detected" TRUE) endif(MSVC) - set(USE_LIBGNUINTL TRUE) endif() if (WIN32) set(HAVE_API_WIN32 1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2011-02-02 00:37:28
|
Revision: 4084 http://navit.svn.sourceforge.net/navit/?rev=4084&view=rev Author: rikky Date: 2011-02-02 00:37:21 +0000 (Wed, 02 Feb 2011) Log Message: ----------- Fix:Build/cmake:Link against pthread if needed. GDB debugging failes without it. Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-02-01 11:58:00 UTC (rev 4083) +++ trunk/navit/CMakeLists.txt 2011-02-02 00:37:21 UTC (rev 4084) @@ -67,6 +67,7 @@ find_package(PNG) find_package(DBusGLib) find_package(OpenSSL) +find_package(Threads) libfind_pkg_check_modules(FONTCONFIG fontconfig) #Qt detection SET(QT_USE_QTSVG TRUE) @@ -93,6 +94,11 @@ ### Configure build #Required libraries, supplied with navit +if (CMAKE_USE_PTHREADS_INIT) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_THREAD_LIBS_INIT}") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_THREAD_LIBS_INIT}") + set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CMAKE_THREAD_LIBS_INIT}") +endif(CMAKE_USE_PTHREADS_INIT) if (Glib_FOUND) set(HAVE_GLIB 1) include_directories(${Glib_INCLUDE_DIRS}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2011-02-02 00:38:29
|
Revision: 4086 http://navit.svn.sourceforge.net/navit/?rev=4086&view=rev Author: rikky Date: 2011-02-02 00:38:23 +0000 (Wed, 02 Feb 2011) Log Message: ----------- Fix:Build/cmake:Enable vehicle_wince for WinCE builds Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-02-02 00:37:58 UTC (rev 4085) +++ trunk/navit/CMakeLists.txt 2011-02-02 00:38:23 UTC (rev 4086) @@ -349,6 +349,7 @@ set(HAVE_API_WIN32_CE 1) set(BUILD_MAPTOOL FALSE) set_with_reason(vehicle/file "wince: currently broken" FALSE) + set_with_reason(vehicle/wince "wince 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: <ri...@us...> - 2011-02-08 22:04:12
|
Revision: 4118 http://navit.svn.sourceforge.net/navit/?rev=4118&view=rev Author: rikky Date: 2011-02-08 22:04:06 +0000 (Tue, 08 Feb 2011) Log Message: ----------- Fix:Build/cmake:Test for WinCE version of winsock Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-02-08 22:03:45 UTC (rev 4117) +++ trunk/navit/CMakeLists.txt 2011-02-08 22:04:06 UTC (rev 4118) @@ -331,6 +331,12 @@ CHECK_LIBRARY_EXISTS(ws2_32 WSAStartup "" HAVE_WINSOCK) if(HAVE_WINSOCK) list(APPEND NAVIT_LIBS ws2_32) + else() + CHECK_LIBRARY_EXISTS(ws2 WSAStartup "" HAVE_WINSOCK_2) + if(HAVE_WINSOCK_2) + set(HAVE_WINSOCK 1) + list(APPEND NAVIT_LIBS ws2) + endif() endif(HAVE_WINSOCK) if(MSVC) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2011-02-28 16:15:52
|
Revision: 4256 http://navit.svn.sourceforge.net/navit/?rev=4256&view=rev Author: rikky Date: 2011-02-28 16:15:46 +0000 (Mon, 28 Feb 2011) Log Message: ----------- Fix:Build/cmake:Link against native intl lib, if available Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-02-28 16:15:32 UTC (rev 4255) +++ trunk/navit/CMakeLists.txt 2011-02-28 16:15:46 UTC (rev 4256) @@ -239,6 +239,8 @@ if (NOT HAVE_LIBINTL) add_plugin(intl_cmake "native libintl missing" TRUE) set(USE_LIBGNUINTL TRUE) +else() + list(APPEND NAVIT_LIBS intl) endif(NOT HAVE_LIBINTL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2011-03-01 10:33:17
|
Revision: 4262 http://navit.svn.sourceforge.net/navit/?rev=4262&view=rev Author: rikky Date: 2011-03-01 10:33:10 +0000 (Tue, 01 Mar 2011) Log Message: ----------- Fix:Build/cmake:Proper test for native libintl Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-02-28 21:30:00 UTC (rev 4261) +++ trunk/navit/CMakeLists.txt 2011-03-01 10:33:10 UTC (rev 4262) @@ -240,7 +240,10 @@ add_plugin(intl_cmake "native libintl missing" TRUE) set(USE_LIBGNUINTL TRUE) else() - list(APPEND NAVIT_LIBS intl) + CHECK_LIBRARY_EXISTS(intl libintl_fprintf "" NEEDS_LIBINTL) + if (NEEDS_LIBINTL) + list(APPEND NAVIT_LIBS intl) + endif(NEEDS_LIBINTL) endif(NOT HAVE_LIBINTL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aka...@us...> - 2011-03-05 18:28:59
|
Revision: 4300 http://navit.svn.sourceforge.net/navit/?rev=4300&view=rev Author: akashihi Date: 2011-03-05 18:28:53 +0000 (Sat, 05 Mar 2011) Log Message: ----------- Fix:build:Setting definitions interferes with rc compiler Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-03-05 17:46:14 UTC (rev 4299) +++ trunk/navit/CMakeLists.txt 2011-03-05 18:28:53 UTC (rev 4300) @@ -330,7 +330,7 @@ if(HAVE_GTK2 AND NOT MSVC) #GTK requires special compile flags - add_definitions("-mms-bitfields") + SET(CFLAGS ${CFLAGS} -mms-bitfields) endif(HAVE_GTK2 AND NOT MSVC) if(MSVC AND support/espeak) add_definitions(-DPLATFORM_WINDOWS) @@ -472,7 +472,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) -add_definitions("-Wall") +SET(CFLAGS ${CFLAGS} -Wall) if (NOT NAVIT_DEPENDENCY_ERROR) message("\nSummary:\n") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2011-03-05 23:20:58
|
Revision: 4302 http://navit.svn.sourceforge.net/navit/?rev=4302&view=rev Author: rikky Date: 2011-03-05 23:20:52 +0000 (Sat, 05 Mar 2011) Log Message: ----------- Fix:build/cmake:Revert 4300. Obsolete with previous commit. Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-03-05 23:20:38 UTC (rev 4301) +++ trunk/navit/CMakeLists.txt 2011-03-05 23:20:52 UTC (rev 4302) @@ -331,7 +331,7 @@ if(HAVE_GTK2 AND NOT MSVC) #GTK requires special compile flags - SET(CFLAGS ${CFLAGS} -mms-bitfields) + add_definitions("-mms-bitfields") endif(HAVE_GTK2 AND NOT MSVC) if(MSVC AND support/espeak) add_definitions(-DPLATFORM_WINDOWS) @@ -473,7 +473,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) -SET(CFLAGS ${CFLAGS} -Wall) +add_definitions("-Wall") if (NOT NAVIT_DEPENDENCY_ERROR) message("\nSummary:\n") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2011-03-05 23:21:14
|
Revision: 4303 http://navit.svn.sourceforge.net/navit/?rev=4303&view=rev Author: rikky Date: 2011-03-05 23:21:08 +0000 (Sat, 05 Mar 2011) Log Message: ----------- Fix:build/cmake:Fixed double definition of EZXML_NOMMAP Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-03-05 23:20:52 UTC (rev 4302) +++ trunk/navit/CMakeLists.txt 2011-03-05 23:21:08 UTC (rev 4303) @@ -140,7 +140,6 @@ endif() if (NOT Glib_FOUND) set_with_reason(support/ezxml "Glib not found" TRUE) - add_definitions(-DEZXML_NOMMAP) endif() if(FREETYPE_FOUND) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aka...@us...> - 2011-03-06 12:53:01
|
Revision: 4308 http://navit.svn.sourceforge.net/navit/?rev=4308&view=rev Author: akashihi Date: 2011-03-06 12:52:55 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Fix:build:It's not a good idea to use convert.exe on windows for xpm processing Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-03-06 12:30:54 UTC (rev 4307) +++ trunk/navit/CMakeLists.txt 2011-03-06 12:52:55 UTC (rev 4308) @@ -128,8 +128,8 @@ endif() if(PNG_FOUND) set(HAVE_PNG 1) -# include_directories(${PNG_INCLUDE_DIRS}) -# list(APPEND NAVIT_LIBS ${PNG_LIBRARY}) + include_directories(${PNG_INCLUDE_DIRS}) + list(APPEND NAVIT_LIBS ${PNG_LIBRARY}) else(PNG_FOUND) message(STATUS "using internal libpng") set_with_reason(support/libpng "native libpng missing" TRUE) @@ -357,7 +357,7 @@ if (WIN32) set(HAVE_API_WIN32 1) set(HAVE_STDINT_H 1) - set(BUILD_MAPTOOL FALSE) + #set(BUILD_MAPTOOL FALSE) set(SAMPLE_MAP FALSE) list(APPEND NAVIT_LIBS winmm) endif() @@ -411,12 +411,15 @@ endif(ANDROID) # Image conversion -find_program(IMAGE_CONVERTER NAMES convert) -execute_process(COMMAND ${IMAGE_CONVERTER} -list format OUTPUT_VARIABLE CONVERT_FORMATS) -if(CONVERT_FORMATS MATCHES ".*XPM[ *][ ]*XPM[ ]*r[w-].*") - message(STATUS ${IMAGE_CONVERTER}) - set(IMAGE_CONVERTER_XPM ${IMAGE_CONVERTER}) -endif() +if(NOT WIN32) +#convert.exe on windows deals with filesystems, not images:D + find_program(IMAGE_CONVERTER NAMES convert) + execute_process(COMMAND ${IMAGE_CONVERTER} -list format OUTPUT_VARIABLE CONVERT_FORMATS) + if(CONVERT_FORMATS MATCHES ".*XPM[ *][ ]*XPM[ ]*r[w-].*") + message(STATUS ${IMAGE_CONVERTER}) + set(IMAGE_CONVERTER_XPM ${IMAGE_CONVERTER}) + endif() +endif(NOT WIN32) if (SVG2PNG) if (NOT IMAGE_CONVERTER_SVGZ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2011-03-06 23:38:37
|
Revision: 4311 http://navit.svn.sourceforge.net/navit/?rev=4311&view=rev Author: rikky Date: 2011-03-06 23:38:31 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Fix:build/cmake:Revert 4308 as it doesn't fix the error and prevents use of convert on windows Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-03-06 23:38:15 UTC (rev 4310) +++ trunk/navit/CMakeLists.txt 2011-03-06 23:38:31 UTC (rev 4311) @@ -128,8 +128,6 @@ endif() if(PNG_FOUND) set(HAVE_PNG 1) - include_directories(${PNG_INCLUDE_DIRS}) - list(APPEND NAVIT_LIBS ${PNG_LIBRARY}) else(PNG_FOUND) message(STATUS "using internal libpng") set_with_reason(support/libpng "native libpng missing" TRUE) @@ -411,15 +409,12 @@ endif(ANDROID) # Image conversion -if(NOT WIN32) -#convert.exe on windows deals with filesystems, not images:D - find_program(IMAGE_CONVERTER NAMES convert) - execute_process(COMMAND ${IMAGE_CONVERTER} -list format OUTPUT_VARIABLE CONVERT_FORMATS) - if(CONVERT_FORMATS MATCHES ".*XPM[ *][ ]*XPM[ ]*r[w-].*") - message(STATUS ${IMAGE_CONVERTER}) - set(IMAGE_CONVERTER_XPM ${IMAGE_CONVERTER}) - endif() -endif(NOT WIN32) +find_program(IMAGE_CONVERTER NAMES convert) +execute_process(COMMAND ${IMAGE_CONVERTER} -list format OUTPUT_VARIABLE CONVERT_FORMATS) +if(CONVERT_FORMATS MATCHES ".*XPM[ *][ ]*XPM[ ]*r[w-].*") + message(STATUS ${IMAGE_CONVERTER}) + set(IMAGE_CONVERTER_XPM ${IMAGE_CONVERTER}) +endif() if (SVG2PNG) if (NOT IMAGE_CONVERTER_SVGZ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2011-03-06 23:38:52
|
Revision: 4312 http://navit.svn.sourceforge.net/navit/?rev=4312&view=rev Author: rikky Date: 2011-03-06 23:38:45 +0000 (Sun, 06 Mar 2011) Log Message: ----------- Fix:build/cmake:Test image converter capabilities before using it Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-03-06 23:38:31 UTC (rev 4311) +++ trunk/navit/CMakeLists.txt 2011-03-06 23:38:45 UTC (rev 4312) @@ -412,14 +412,18 @@ find_program(IMAGE_CONVERTER NAMES convert) execute_process(COMMAND ${IMAGE_CONVERTER} -list format OUTPUT_VARIABLE CONVERT_FORMATS) if(CONVERT_FORMATS MATCHES ".*XPM[ *][ ]*XPM[ ]*r[w-].*") - message(STATUS ${IMAGE_CONVERTER}) set(IMAGE_CONVERTER_XPM ${IMAGE_CONVERTER}) endif() if (SVG2PNG) if (NOT IMAGE_CONVERTER_SVGZ) - set (SVG_CONVERTER_PROGS rsvg-convert ksvgtopng ksvgtopng4 convert) + set (SVG_CONVERTER_PROGS rsvg-convert ksvgtopng ksvgtopng4) find_program(IMAGE_CONVERTER_SVGZ NAMES ${SVG_CONVERTER_PROGS}) + if (NOT IMAGE_CONVERTER_SVGZ) + if(CONVERT_FORMATS MATCHES ".*[ ]*SVG[ ]*r[w-].*") + set(IMAGE_CONVERTER_SVGZ ${IMAGE_CONVERTER}) + endif() + endif() endif(NOT IMAGE_CONVERTER_SVGZ) if (NOT IMAGE_CONVERTER_SVG) set(IMAGE_CONVERTER_SVG ${IMAGE_CONVERTER_SVGZ}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2011-03-12 20:40:26
|
Revision: 4333 http://navit.svn.sourceforge.net/navit/?rev=4333&view=rev Author: rikky Date: 2011-03-12 20:40:20 +0000 (Sat, 12 Mar 2011) Log Message: ----------- Fix:build/cmake:If possible process windows.xslt on windows builds. Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-03-12 20:40:05 UTC (rev 4332) +++ trunk/navit/CMakeLists.txt 2011-03-12 20:40:20 UTC (rev 4333) @@ -294,6 +294,15 @@ add_feature(BUILD_MAPTOOL "default" TRUE) add_feature(XSL_PROCESSING "default" TRUE) +find_program(SAXON NAMES saxon saxon8 saxon-xslt) +if(NOT SAXON) + cfg_feature(XSL_PROCESSING "Saxon missing" FALSE) +endif() + +if (NOT XSL_PROCESSING) + message(WARNING "XSLT processing disabled. You have to configure navit.xml yourself, or enable XSLT processing.") +endif() + ### Platform specific settings if(WIN32 OR WINCE) SET(CMAKE_EXECUTABLE_SUFFIX ".exe") @@ -352,6 +361,8 @@ set(ENABLE_NLS TRUE) endif(MSVC) enable_language(RC) + + set(XSLTS "windows;${XSLTS}" CACHE STRING "define a semicolon seperated list of XSLTs to process") endif() if (WIN32) set(HAVE_API_WIN32 1) @@ -379,11 +390,6 @@ endif(CMAKE_CROSSCOMPILING) endif(SAMPLE_MAP) -find_program(SAXON NAMES saxon saxon8 saxon-xslt) -if(NOT SAXON) - cfg_feature(XSL_PROCESSING "Saxon missing" FALSE) -endif() - if(ANDROID) find_program(ANDROID_LOCATION NAMES android android.bat) find_program(ANT_LOCATION NAMES ant) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2011-03-12 20:41:19
|
Revision: 4336 http://navit.svn.sourceforge.net/navit/?rev=4336&view=rev Author: rikky Date: 2011-03-12 20:41:13 +0000 (Sat, 12 Mar 2011) Log Message: ----------- Fix:build/cmake:Add missing linker dependency for libintl to support_glib. Makes maptool compilable on older mingw. Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-03-12 20:40:57 UTC (rev 4335) +++ trunk/navit/CMakeLists.txt 2011-03-12 20:41:13 UTC (rev 4336) @@ -97,6 +97,18 @@ ### Configure build #Required libraries, supplied with navit +if (NOT HAVE_LIBINTL) + add_plugin(intl_cmake "native libintl missing" TRUE) + set(USE_LIBGNUINTL TRUE) +else() + CHECK_LIBRARY_EXISTS(intl libintl_fprintf "" NEEDS_LIBINTL) + if (NEEDS_LIBINTL) + list(APPEND NAVIT_LIBS intl) + set(INTL_LIBS intl) + endif(NEEDS_LIBINTL) +endif(NOT HAVE_LIBINTL) + + if (CMAKE_USE_PTHREADS_INIT) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_THREAD_LIBS_INIT}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_THREAD_LIBS_INIT}") @@ -107,7 +119,7 @@ include_directories(${Glib_INCLUDE_DIRS}) list(APPEND NAVIT_LIBS ${Glib_LIBRARIES}) else(Glib_FOUND) - set_with_reason(support/glib "Glib not found" TRUE) + set_with_reason(support/glib "Glib not found" TRUE ${INTL_LIBS}) endif(Glib_FOUND) if (Gmodule_FOUND) set(HAVE_GMODULE 1) @@ -234,17 +246,6 @@ endif() endif(GETTEXT_FOUND) -if (NOT HAVE_LIBINTL) - add_plugin(intl_cmake "native libintl missing" TRUE) - set(USE_LIBGNUINTL TRUE) -else() - CHECK_LIBRARY_EXISTS(intl libintl_fprintf "" NEEDS_LIBINTL) - if (NEEDS_LIBINTL) - list(APPEND NAVIT_LIBS intl) - endif(NEEDS_LIBINTL) -endif(NOT HAVE_LIBINTL) - - #Independent modules add_module(graphics/null "Default" TRUE) add_module(osd/core "Default" TRUE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2011-03-13 22:54:33
|
Revision: 4341 http://navit.svn.sourceforge.net/navit/?rev=4341&view=rev Author: rikky Date: 2011-03-13 22:54:27 +0000 (Sun, 13 Mar 2011) Log Message: ----------- Fix:build/cmake:Reduce number of default scales for svn to png conversion Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-03-13 01:36:29 UTC (rev 4340) +++ trunk/navit/CMakeLists.txt 2011-03-13 22:54:27 UTC (rev 4341) @@ -282,13 +282,13 @@ add_feature(SAMPLE_MAP "default" TRUE) IF(NOT svg2png_scaling) - set(svg2png_scaling 0 32 48 64 96) + set(svg2png_scaling 0 32 48 64) ENDIF() IF(NOT svg2png_scaling_flag) - set(svg2png_scaling_flag 0 32 48 64 96) + set(svg2png_scaling_flag 32) ENDIF() IF(NOT svg2png_scaling_nav) - set(svg2png_scaling_nav 0 32 48 59 64 96) + set(svg2png_scaling_nav 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. |
From: <ri...@us...> - 2011-03-15 22:15:40
|
Revision: 4351 http://navit.svn.sourceforge.net/navit/?rev=4351&view=rev Author: rikky Date: 2011-03-15 22:15:34 +0000 (Tue, 15 Mar 2011) Log Message: ----------- Fix:build/cmake:Fixed building with cmake 2.6 in wine with mingw32 Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-03-15 22:15:14 UTC (rev 4350) +++ trunk/navit/CMakeLists.txt 2011-03-15 22:15:34 UTC (rev 4351) @@ -1,4 +1,4 @@ -project(navit) +project(navit C) cmake_minimum_required(VERSION 2.6) cmake_policy(VERSION 2.6) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2011-03-17 22:36:14
|
Revision: 4359 http://navit.svn.sourceforge.net/navit/?rev=4359&view=rev Author: rikky Date: 2011-03-17 22:36:08 +0000 (Thu, 17 Mar 2011) Log Message: ----------- Fix:build/cmake:Revert 4351 as it breaks Qt stuff Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-03-17 21:53:40 UTC (rev 4358) +++ trunk/navit/CMakeLists.txt 2011-03-17 22:36:08 UTC (rev 4359) @@ -1,4 +1,4 @@ -project(navit C) +project(navit) cmake_minimum_required(VERSION 2.6) cmake_policy(VERSION 2.6) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2011-03-18 19:16:34
|
Revision: 4366 http://navit.svn.sourceforge.net/navit/?rev=4366&view=rev Author: rikky Date: 2011-03-18 19:16:27 +0000 (Fri, 18 Mar 2011) Log Message: ----------- Fix:build/cmake:Added "saxonb-xslt" to the list of supported xslt processors Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-03-18 19:16:09 UTC (rev 4365) +++ trunk/navit/CMakeLists.txt 2011-03-18 19:16:27 UTC (rev 4366) @@ -294,7 +294,7 @@ add_feature(BUILD_MAPTOOL "default" TRUE) add_feature(XSL_PROCESSING "default" TRUE) -find_program(SAXON NAMES saxon saxon8 saxon-xslt) +find_program(SAXON NAMES saxon saxon8 saxon-xslt saxonb-xslt) if(NOT SAXON) cfg_feature(XSL_PROCESSING "Saxon missing" FALSE) endif() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ri...@us...> - 2011-05-02 20:07:30
|
Revision: 4466 http://navit.svn.sourceforge.net/navit/?rev=4466&view=rev Author: rikky Date: 2011-05-02 20:07:24 +0000 (Mon, 02 May 2011) Log Message: ----------- Fix:build/cmake:Disable speech/cmdline when building with support/glib. broken by last speech/cmdline changes. Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-05-02 20:07:10 UTC (rev 4465) +++ trunk/navit/CMakeLists.txt 2011-05-02 20:07:24 UTC (rev 4466) @@ -50,6 +50,7 @@ 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) @@ -127,6 +128,8 @@ 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) @@ -282,7 +285,6 @@ add_module(map/shapefile "Default" TRUE) add_module(map/textfile "Default" TRUE) add_module(map/csv "Default" TRUE) -add_module(speech/cmdline "Default" TRUE) #Modules without test yet add_module(plugin/pedestrian "Default" FALSE) @@ -327,7 +329,7 @@ ### Platform specific settings if(NOT CACHE_SIZE) SET(CACHE_SIZE 1048576) -endif(CACHE_SIZE) +endif(NOT CACHE_SIZE) if(WIN32 OR WINCE) SET(CMAKE_EXECUTABLE_SUFFIX ".exe") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-05-09 12:38:05
|
Revision: 4483 http://navit.svn.sourceforge.net/navit/?rev=4483&view=rev Author: martin-s Date: 2011-05-09 12:37:58 +0000 (Mon, 09 May 2011) Log Message: ----------- Add:Build:Option to specify extra compile flags Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-05-09 12:28:26 UTC (rev 4482) +++ trunk/navit/CMakeLists.txt 2011-05-09 12:37:58 UTC (rev 4483) @@ -563,6 +563,11 @@ add_subdirectory (navit) add_subdirectory (man) +if (EXTRA_DEFINES) + add_definitions(${EXTRA_DEFINES}) +endif(EXTRA_DEFINES) + + if (GETTEXT_FOUND) add_subdirectory (po) #install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/locale DESTINATION ${LOCALE_DIR}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-05-09 12:48:40
|
Revision: 4486 http://navit.svn.sourceforge.net/navit/?rev=4486&view=rev Author: martin-s Date: 2011-05-09 12:48:34 +0000 (Mon, 09 May 2011) Log Message: ----------- Add:Build:option to specify additional libraries Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-05-09 12:43:32 UTC (rev 4485) +++ trunk/navit/CMakeLists.txt 2011-05-09 12:48:34 UTC (rev 4486) @@ -567,6 +567,9 @@ add_definitions(${EXTRA_DEFINES}) endif(EXTRA_DEFINES) +if (EXTRA_LIBS) + list(APPEND NAVIT_LIBS ${EXTRA_LIBS}) +endif(EXTRA_LIBS) if (GETTEXT_FOUND) add_subdirectory (po) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-05-09 13:00:45
|
Revision: 4488 http://navit.svn.sourceforge.net/navit/?rev=4488&view=rev Author: martin-s Date: 2011-05-09 13:00:39 +0000 (Mon, 09 May 2011) Log Message: ----------- Fix:Build:Moved to correct place Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-05-09 12:49:34 UTC (rev 4487) +++ trunk/navit/CMakeLists.txt 2011-05-09 13:00:39 UTC (rev 4488) @@ -510,6 +510,9 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) add_definitions("-Wall") +if (EXTRA_DEFINES) + add_definitions("${EXTRA_DEFINES}") +endif(EXTRA_DEFINES) if (NOT NAVIT_DEPENDENCY_ERROR) message("\nSummary:\n") @@ -563,9 +566,6 @@ add_subdirectory (navit) add_subdirectory (man) -if (EXTRA_DEFINES) - add_definitions(${EXTRA_DEFINES}) -endif(EXTRA_DEFINES) if (EXTRA_LIBS) list(APPEND NAVIT_LIBS ${EXTRA_LIBS}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-05-09 13:15:06
|
Revision: 4489 http://navit.svn.sourceforge.net/navit/?rev=4489&view=rev Author: martin-s Date: 2011-05-09 13:15:00 +0000 (Mon, 09 May 2011) Log Message: ----------- Fix:Build:Moved to correct place Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-05-09 13:00:39 UTC (rev 4488) +++ trunk/navit/CMakeLists.txt 2011-05-09 13:15:00 UTC (rev 4489) @@ -22,11 +22,16 @@ set(IMAGE_DIR share/navit/xpm) set(LIB_DIR lib) -### Detect environment foreach(EXTRA_MODULE ${EXTRA_MODULES}) add_module(${EXTRA_MODULE} "extra module specified" TRUE) endforeach() +if (EXTRA_LIBS) + list(APPEND NAVIT_LIBS ${EXTRA_LIBS}) +endif(EXTRA_LIBS) + +### Detect environment + add_plugin(support/ezxml "native Glib found" FALSE) add_plugin(support/glib "native Glib found" FALSE) add_plugin(support/zlib "native zlib found" FALSE) @@ -567,10 +572,6 @@ add_subdirectory (man) -if (EXTRA_LIBS) - list(APPEND NAVIT_LIBS ${EXTRA_LIBS}) -endif(EXTRA_LIBS) - if (GETTEXT_FOUND) add_subdirectory (po) #install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/locale DESTINATION ${LOCALE_DIR}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aka...@us...> - 2011-05-16 12:11:24
|
Revision: 4495 http://navit.svn.sourceforge.net/navit/?rev=4495&view=rev Author: akashihi Date: 2011-05-16 12:11:15 +0000 (Mon, 16 May 2011) Log Message: ----------- Fix:build:Fixed win32 build with supplied libpng Modified Paths: -------------- trunk/navit/CMakeLists.txt Modified: trunk/navit/CMakeLists.txt =================================================================== --- trunk/navit/CMakeLists.txt 2011-05-15 17:54:13 UTC (rev 4494) +++ trunk/navit/CMakeLists.txt 2011-05-16 12:11:15 UTC (rev 4495) @@ -156,6 +156,8 @@ endif() if(PNG_FOUND) set(HAVE_PNG 1) + include_directories(${PNG_INCLUDE_DIR}) + list(APPEND NAVIT_LIBS ${PNG_LIBRARIES}) else(PNG_FOUND) message(STATUS "using internal libpng") set_with_reason(support/libpng "native libpng missing" TRUE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |