Ticket #832: fix-cmake.2.patch

File fix-cmake.2.patch, 2.0 KB (added by pini, 9 years ago)
  • navit/CMakeLists.txt

    Description: Fix cmake config to produce same packages as with the autotools
     This patch apply various fixes and workaround so that the generated binary
     packages are close to the one generated with the autotools configuration.
    Author: Gilles Filippini <pini@debian.org>
    Forwarded: http://trac.navit-project.org/ticket/832
    Last-Update: 2011-05-16
    old new  
    138138add_subdirectory (maptool)
    139139add_subdirectory (xpm)
    140140add_subdirectory (maps)
    141 add_subdirectory (android)
     141if (ANDROID)
     142   add_subdirectory (android)
     143endif()
    142144
    143145install(TARGETS navit
    144146        DESTINATION ${BIN_DIR}
  • CMakeLists.txt

    old new  
    574574
    575575if (GETTEXT_FOUND)
    576576   add_subdirectory (po)
    577    #install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/locale DESTINATION ${LOCALE_DIR})
     577   install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/locale DESTINATION ${LOCALE_DIR})
    578578endif(GETTEXT_FOUND)
    579579
    580580
  • cmake/navit_macros.cmake

    old new  
    1111   if (DEFINED ${VARIABLE}_REASON AND NOT ${VARIABLE}_REASON STREQUAL "User defined")
    1212      set(${VARIABLE} ${ENABLE})
    1313      set(${VARIABLE}_REASON ${REASON})
    14       string(REPLACE "/" "_" VARIABLE_NAMES ${VARIABLE})
    15       set(${VARIABLE_NAMES}_LIBS ${ARGN})
    1614   else()
    1715      message("Do not change user defined settings for ${VARIABLE}")
    1816   endif()
     17   string(REPLACE "/" "_" VARIABLE_NAMES ${VARIABLE})
     18   set(${VARIABLE_NAMES}_LIBS ${ARGN})
    1919endmacro()
    2020
    2121macro(add_feature FEATURE REASON ENABLE)