Add:Build:Make integration of additional modules easier

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3944 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt
index 68be9f9..e5bcdc7 100644 (file)
--- a/navit/CMakeLists.txt
+++ b/navit/CMakeLists.txt
@@ -23,6 +23,9 @@ 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()
 
 add_plugin(support/ezxml "native Glib found" FALSE)
 add_plugin(support/glib "native Glib found" FALSE)

diff --git a/navit/cmake/version.cmake b/navit/cmake/version.cmake
index 87cc1ac..60443fb 100644 (file)
--- a/navit/cmake/version.cmake
+++ b/navit/cmake/version.cmake
@@ -26,7 +26,7 @@ EXECUTE_PROCESS(
      OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-set( SVN_VERSION "unknown" )
+set( ${NAME} "unknown" )
 
 if (NOT VERSION)
    FIND_PACKAGE(Subversion)
@@ -42,13 +42,13 @@ if (NOT VERSION)
    endif(Subversion_FOUND)
 
    if (VERSION)
-      set( SVN_VERSION ${VERSION} )
+      set( ${NAME} ${VERSION} )
    endif(VERSION)
 else()
-   string(REGEX REPLACE "Revision: " "" SVN_VERSION ${VERSION})
+   string(REGEX REPLACE "Revision: " "" ${NAME} ${VERSION})
 endif(NOT VERSION)
 
 set(NAVIT_VARIANT "-")
 
-message (STATUS "SVN-version ${SVN_VERSION}")
+message (STATUS "SVN-version ${${NAME}}")
 CONFIGURE_FILE(${SRC} ${DST} @ONLY)

diff --git a/navit/navit/CMakeLists.txt b/navit/navit/CMakeLists.txt
index b1b778b..185b49e 100644 (file)
--- a/navit/navit/CMakeLists.txt
+++ b/navit/navit/CMakeLists.txt
@@ -83,6 +83,7 @@ ADD_CUSTOM_TARGET(
    version
    ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
                     -D DST=${CMAKE_CURRENT_BINARY_DIR}/version.h
+                   -D NAME=SVN_VERSION
                     -P ${PROJECT_SOURCE_DIR}/cmake/version.cmake
 )