| 1 |
floppym 15/01/30 19:46:16 |
| 2 |
|
| 3 |
Added: freerdp-1.1-cmake-3.1.patch |
| 4 |
Log: |
| 5 |
Backport cmake-3.1 patch to earlier ebuilds, bug 538278. Thanks to Mark R. Pariente. |
| 6 |
|
| 7 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-misc/freerdp/files/freerdp-1.1-cmake-3.1.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/freerdp/files/freerdp-1.1-cmake-3.1.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/freerdp/files/freerdp-1.1-cmake-3.1.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: freerdp-1.1-cmake-3.1.patch |
| 16 |
=================================================================== |
| 17 |
From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001 |
| 18 |
From: Bernhard Miklautz <bernhard.miklautz@××××××××.at> |
| 19 |
Date: Fri, 12 Dec 2014 18:26:45 +0100 |
| 20 |
Subject: [PATCH] build: cmake 3.1 compatibility |
| 21 |
|
| 22 |
* fix problem with REMOVE_DUPLICATES on undefined lists |
| 23 |
* since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single / instead of // as |
| 24 |
previously - necessary adoptions for regex and matches done. Should |
| 25 |
work with all cmake versions. |
| 26 |
|
| 27 |
Tested with 3.1.0-rc3 |
| 28 |
--- |
| 29 |
channels/CMakeLists.txt | 4 ++-- |
| 30 |
channels/client/CMakeLists.txt | 2 ++ |
| 31 |
client/CMakeLists.txt | 4 ++-- |
| 32 |
server/CMakeLists.txt | 4 ++-- |
| 33 |
third-party/CMakeLists.txt | 6 +++--- |
| 34 |
5 files changed, 11 insertions(+), 9 deletions(-) |
| 35 |
|
| 36 |
diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt |
| 37 |
index c4e6048..540b1ac 100644 |
| 38 |
--- a/channels/CMakeLists.txt |
| 39 |
+++ b/channels/CMakeLists.txt |
| 40 |
@@ -253,8 +253,8 @@ set(FILENAME "ChannelOptions.cmake") |
| 41 |
file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}") |
| 42 |
|
| 43 |
foreach(FILEPATH ${FILEPATHS}) |
| 44 |
- if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}") |
| 45 |
- string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" DIR ${FILEPATH}) |
| 46 |
+ if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}") |
| 47 |
+ string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" DIR ${FILEPATH}) |
| 48 |
set(CHANNEL_OPTION) |
| 49 |
include(${FILEPATH}) |
| 50 |
if(${CHANNEL_OPTION}) |
| 51 |
diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt |
| 52 |
index 049bc7b..2db18e8 100644 |
| 53 |
--- a/channels/client/CMakeLists.txt |
| 54 |
+++ b/channels/client/CMakeLists.txt |
| 55 |
@@ -24,7 +24,9 @@ set(${MODULE_PREFIX}_SRCS |
| 56 |
${CMAKE_CURRENT_SOURCE_DIR}/addin.c |
| 57 |
${CMAKE_CURRENT_SOURCE_DIR}/addin.h) |
| 58 |
|
| 59 |
+if(CHANNEL_STATIC_CLIENT_ENTRIES) |
| 60 |
list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES) |
| 61 |
+endif() |
| 62 |
|
| 63 |
foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES}) |
| 64 |
foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES}) |
| 65 |
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt |
| 66 |
index 09b1fd4..610f35e 100644 |
| 67 |
--- a/third-party/CMakeLists.txt |
| 68 |
+++ b/third-party/CMakeLists.txt |
| 69 |
@@ -22,11 +22,11 @@ |
| 70 |
file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt") |
| 71 |
|
| 72 |
foreach(dir ${all_valid_subdirs}) |
| 73 |
- if(${dir} MATCHES "^([^/]*)//CMakeLists.txt") |
| 74 |
- string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir}) |
| 75 |
+ if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt") |
| 76 |
+ string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir}) |
| 77 |
message(STATUS "Adding third-party component ${dir_trimmed}") |
| 78 |
add_subdirectory(${dir_trimmed}) |
| 79 |
endif() |
| 80 |
endforeach(dir) |
| 81 |
|
| 82 |
-set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE) |
| 83 |
\ No newline at end of file |
| 84 |
+set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE) |
Archives