Ticket #832: fix-cmake.3.patch

File fix-cmake.3.patch, 2.3 KB (added by pini, 9 years ago)

Patch against r4724

  • cmake/navit_macros.cmake

    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-09-11
    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)
  • navit/font/freetype/CMakeLists.txt

    old new  
    77   )
    88   set_property(
    99      TARGET font_freetype
    10       APPEND PROPERTY COMPILE_FLAGS "-I${FRIBIDI_INCLUDE_DIRS}"
     10      PROPERTY COMPILE_FLAGS "-I${FRIBIDI_INCLUDE_DIRS}"
    1111   )
    1212   if (NOT FRIBIDI2_FOUND)
    1313      set_property(
  • navit/binding/dbus/CMakeLists.txt

    old new  
    11module_add_library(binding_dbus binding_dbus.c)
    2 install(FILES org.navit_project.navit.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/services/)
    3  No newline at end of file
     2configure_file(
     3  org.navit_project.navit.service.in
     4  org.navit_project.navit.service
     5  @ONLY
     6)
     7install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.navit_project.navit.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dbus-1/services/)