Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/freerdp/patches/freerdp-1.0.2-cmake31.patch

    Contents of /trunk/freerdp/patches/freerdp-1.0.2-cmake31.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2601 - (show annotations) (download)
    Fri Jun 26 15:29:08 2015 UTC (8 years, 10 months ago) by niro
    File size: 4047 byte(s) 
    -fixed a typo
    1 From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001
    2 From: Bernhard Miklautz <bernhard.miklautz@shacknet.at>
    3 Date: Fri, 12 Dec 2014 18:26:45 +0100
    4 Subject: [PATCH] build: cmake 3.1 compatibility
    5
    6 * fix problem with REMOVE_DUPLICATES on undefined lists
    7 * since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single / instead of // as
    8 previously - necessary adoptions for regex and matches done. Should
    9 work with all cmake versions.
    10
    11 Tested with 3.1.0-rc3
    12 ---
    13 channels/CMakeLists.txt | 4 ++--
    14 channels/client/CMakeLists.txt | 2 ++
    15 client/CMakeLists.txt | 4 ++--
    16 server/CMakeLists.txt | 4 ++--
    17 third-party/CMakeLists.txt | 6 +++---
    18 5 files changed, 11 insertions(+), 9 deletions(-)
    19
    20 diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt
    21 index c4e6048..540b1ac 100644
    22 --- a/channels/CMakeLists.txt
    23 +++ b/channels/CMakeLists.txt
    24 @@ -253,8 +253,8 @@ set(FILENAME "ChannelOptions.cmake")
    25 file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
    26
    27 foreach(FILEPATH ${FILEPATHS})
    28 - if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
    29 - string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" DIR ${FILEPATH})
    30 + if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
    31 + string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" DIR ${FILEPATH})
    32 set(CHANNEL_OPTION)
    33 include(${FILEPATH})
    34 if(${CHANNEL_OPTION})
    35 diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt
    36 index 049bc7b..2db18e8 100644
    37 --- a/channels/client/CMakeLists.txt
    38 +++ b/channels/client/CMakeLists.txt
    39 @@ -24,7 +24,9 @@ set(${MODULE_PREFIX}_SRCS
    40 ${CMAKE_CURRENT_SOURCE_DIR}/addin.c
    41 ${CMAKE_CURRENT_SOURCE_DIR}/addin.h)
    42
    43 +if(CHANNEL_STATIC_CLIENT_ENTRIES)
    44 list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)
    45 +endif()
    46
    47 foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES})
    48 foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})
    49 diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
    50 index 14ed363..b8b7699 100644
    51 --- a/client/CMakeLists.txt
    52 +++ b/client/CMakeLists.txt
    53 @@ -63,8 +63,8 @@ set(FILENAME "ModuleOptions.cmake")
    54 file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
    55
    56 foreach(FILEPATH ${FILEPATHS})
    57 - if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
    58 - string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" FREERDP_CLIENT ${FILEPATH})
    59 + if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
    60 + string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" FREERDP_CLIENT ${FILEPATH})
    61 set(FREERDP_CLIENT_ENABLED 0)
    62 include(${FILEPATH})
    63 if(FREERDP_CLIENT_ENABLED)
    64 diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
    65 index cda14ba..ee9458e 100644
    66 --- a/server/CMakeLists.txt
    67 +++ b/server/CMakeLists.txt
    68 @@ -48,8 +48,8 @@ set(FILENAME "ModuleOptions.cmake")
    69 file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
    70
    71 foreach(FILEPATH ${FILEPATHS})
    72 - if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
    73 - string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" FREERDP_SERVER ${FILEPATH})
    74 + if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
    75 + string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" FREERDP_SERVER ${FILEPATH})
    76 set(FREERDP_SERVER_ENABLED 0)
    77 include(${FILEPATH})
    78 if(FREERDP_SERVER_ENABLED)
    79 diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
    80 index 09b1fd4..610f35e 100644
    81 --- a/third-party/CMakeLists.txt
    82 +++ b/third-party/CMakeLists.txt
    83 @@ -22,11 +22,11 @@
    84 file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
    85
    86 foreach(dir ${all_valid_subdirs})
    87 - if(${dir} MATCHES "^([^/]*)//CMakeLists.txt")
    88 - string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir})
    89 + if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
    90 + string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir})
    91 message(STATUS "Adding third-party component ${dir_trimmed}")
    92 add_subdirectory(${dir_trimmed})
    93 endif()
    94 endforeach(dir)
    95
    96 -set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)
    97 \ No newline at end of file
    98 +set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)