Fix:core/cmake:Enable runnig from source direcory

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

diff --git a/navit/cmake/navit_macros.cmake b/navit/cmake/navit_macros.cmake
index 8188aad..2dad15c 100644 (file)
--- a/navit/cmake/navit_macros.cmake
+++ b/navit/cmake/navit_macros.cmake
@@ -22,7 +22,11 @@ macro(module_add_library MODULE_NAME )
    SET_TARGET_PROPERTIES(${MODULE_NAME} PROPERTIES COMPILE_DEFINITIONS "MODULE=${MODULE_NAME}")
    
    if (USE_PLUGINS)
-      SET_TARGET_PROPERTIES( ${LIB_NAME} PROPERTIES COMPILE_FLAGS ${NAVIT_COMPILE_FLAGS})
+      SET_TARGET_PROPERTIES( ${MODULE_NAME} PROPERTIES COMPILE_FLAGS ${NAVIT_COMPILE_FLAGS})
+      
+      # workaround to be compatible with old paths
+      set_target_properties( ${MODULE_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.libs")
+      
       TARGET_LINK_LIBRARIES(${MODULE_NAME} navit_core)
       install(TARGETS ${MODULE_NAME}
               DESTINATION ${LIB_DIR}/navit/${${MODULE_NAME}_TYPE}

diff --git a/navit/navit/main.c b/navit/navit/main.c
index 6a12697..330f2c2 100644 (file)
--- a/navit/navit/main.c
+++ b/navit/navit/main.c
@@ -208,7 +208,7 @@ main_init(const char *program)
        setlocale(LC_ALL,"");
        setlocale(LC_NUMERIC,"C");
 #if !defined _WIN32 && !defined _WIN32_WCE
-       if (file_exists("navit.c") || file_exists("navit.o") || file_exists("navit.lo")) {
+       if (file_exists("navit.c") || file_exists("navit.o") || file_exists("navit.lo") || file_exists("version.h")) {
                char buffer[PATH_MAX];
                printf(_("Running from source directory\n"));
                getcwd(buffer, PATH_MAX);               /* libc of navit returns "dummy" */