Fix build on CMake 3.1
This commit is contained in:
Simone Caronni
parent
806307856a
commit
27e6fc1ab8
|
|
@ -0,0 +1,79 @@
|
|||
diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt
|
||||
index c4e6048..540b1ac 100644
|
||||
--- a/channels/CMakeLists.txt
|
||||
+++ b/channels/CMakeLists.txt
|
||||
@@ -253,8 +253,8 @@ set(FILENAME "ChannelOptions.cmake")
|
||||
file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
|
||||
|
||||
foreach(FILEPATH ${FILEPATHS})
|
||||
- if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
|
||||
- string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" DIR ${FILEPATH})
|
||||
+ if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
|
||||
+ string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" DIR ${FILEPATH})
|
||||
set(CHANNEL_OPTION)
|
||||
include(${FILEPATH})
|
||||
if(${CHANNEL_OPTION})
|
||||
diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt
|
||||
index 049bc7b..2db18e8 100644
|
||||
--- a/channels/client/CMakeLists.txt
|
||||
+++ b/channels/client/CMakeLists.txt
|
||||
@@ -24,7 +24,9 @@ set(${MODULE_PREFIX}_SRCS
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/addin.c
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/addin.h)
|
||||
|
||||
+if(CHANNEL_STATIC_CLIENT_ENTRIES)
|
||||
list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)
|
||||
+endif()
|
||||
|
||||
foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES})
|
||||
foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})
|
||||
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
|
||||
index 14ed363..b8b7699 100644
|
||||
--- a/client/CMakeLists.txt
|
||||
+++ b/client/CMakeLists.txt
|
||||
@@ -63,8 +63,8 @@ set(FILENAME "ModuleOptions.cmake")
|
||||
file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
|
||||
|
||||
foreach(FILEPATH ${FILEPATHS})
|
||||
- if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
|
||||
- string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" FREERDP_CLIENT ${FILEPATH})
|
||||
+ if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
|
||||
+ string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" FREERDP_CLIENT ${FILEPATH})
|
||||
set(FREERDP_CLIENT_ENABLED 0)
|
||||
include(${FILEPATH})
|
||||
if(FREERDP_CLIENT_ENABLED)
|
||||
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
|
||||
index cda14ba..ee9458e 100644
|
||||
--- a/server/CMakeLists.txt
|
||||
+++ b/server/CMakeLists.txt
|
||||
@@ -48,8 +48,8 @@ set(FILENAME "ModuleOptions.cmake")
|
||||
file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
|
||||
|
||||
foreach(FILEPATH ${FILEPATHS})
|
||||
- if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
|
||||
- string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" FREERDP_SERVER ${FILEPATH})
|
||||
+ if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
|
||||
+ string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" FREERDP_SERVER ${FILEPATH})
|
||||
set(FREERDP_SERVER_ENABLED 0)
|
||||
include(${FILEPATH})
|
||||
if(FREERDP_SERVER_ENABLED)
|
||||
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
|
||||
index 09b1fd4..610f35e 100644
|
||||
--- a/third-party/CMakeLists.txt
|
||||
+++ b/third-party/CMakeLists.txt
|
||||
@@ -22,11 +22,11 @@
|
||||
file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
|
||||
|
||||
foreach(dir ${all_valid_subdirs})
|
||||
- if(${dir} MATCHES "^([^/]*)//CMakeLists.txt")
|
||||
- string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir})
|
||||
+ if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
|
||||
+ string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir})
|
||||
message(STATUS "Adding third-party component ${dir_trimmed}")
|
||||
add_subdirectory(${dir_trimmed})
|
||||
endif()
|
||||
endforeach(dir)
|
||||
|
||||
-set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)
|
||||
\ No newline at end of file
|
||||
+set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
Name: freerdp
|
||||
Version: 1.2.0
|
||||
Release: 0.3.beta.1%{?dist}
|
||||
Release: 0.4.beta.1%{?dist}
|
||||
Epoch: 1
|
||||
Summary: Free implementation of the Remote Desktop Protocol (RDP)
|
||||
|
||||
|
|
@ -8,6 +8,8 @@ License: ASL 2.0
|
|||
URL: http://www.freerdp.com/
|
||||
Source0: https://github.com/FreeRDP/FreeRDP/archive/%{version}-beta1+android9.tar.gz
|
||||
Patch0: freerdp-aarch64.patch
|
||||
# https://github.com/FreeRDP/FreeRDP/commit/1b663ceffe51008af7ae9749e5b7999b2f7d6698
|
||||
Patch1: freerdp-cmake-list.patch
|
||||
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: cmake >= 2.8
|
||||
|
|
@ -87,6 +89,7 @@ developing applications that use %{name}-libwinpr.
|
|||
%prep
|
||||
%setup -qn FreeRDP-%{version}-beta1-android9
|
||||
%patch0 -p1 -b .aarch64
|
||||
%patch1 -p1 -b .cmake-list
|
||||
|
||||
# Rpmlint fixes
|
||||
find . -name "*.h" -exec chmod 664 {} \;
|
||||
|
|
@ -180,6 +183,9 @@ find %{buildroot} -name "*.a" -delete
|
|||
%{_libdir}/pkgconfig/winpr.pc
|
||||
|
||||
%changelog
|
||||
* Tue Dec 16 2014 Simone Caronni <negativo17@gmail.com> - 1:1.2.0-0.4.beta.1
|
||||
- Fix build on CMake 3.1.
|
||||
|
||||
* Wed Nov 12 2014 Simone Caronni <negativo17@gmail.com> - 1:1.2.0-0.3.beta.1
|
||||
- Update to latest 1.2.0 beta 1 refresh.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue