Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FreeRDP/FreeRDP.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Miklautz <bernhard.miklautz@thincast.com>2016-01-08 16:07:35 +0300
committerBernhard Miklautz <bernhard.miklautz@thincast.com>2016-01-12 19:32:33 +0300
commit6fa36081112c46951096cddfacc0f760e4728b25 (patch)
treefaa77e8b06f52d02adc4fb5f4877a707ca62bc9b /third-party
parentb8136a376992dc0ba037ca402e7a7c4eca6c412b (diff)
cleanup cmake exports and pkg-config files
With this commit the "exported" components (usable with pkg-config and cmake find module package) * winpr - winpr library and headers * freerdp - core library and headers * freerdp-client - client specific library * freerdp-server - server specific library * rdtk - rdtk headers and library To allow the installation of multiple different version (different major number) the include files were moved into the respective sub folder: freerdp -> freerdp{MAJOR}/freerdp (currently freerdp2/freerdp/) winpr -> winpr{MAJOR}/winpr (currently winrp1/winpr/) rdtk -> rdpk{MAJOR}/rdtk (currently rdtk0/rdtk/ The generated pkg-config and cmake find modules now also include the major version number. Currently the following pkg-config are generated and installed. * winpr1 * freerdp2 * freerdp-server2 * freerdp-client2 * rdtk0 As cmake is able to handle multiple versions out of the box the following can be used to find a specific module: find_package(WinPR) find_package(FreeRDP) find_package(FreeRDP-Server) find_package(FreeRDP-Client) find_package(RdTk) As cmake doesn't automatically resolve dependencies for packages it is necessary to manually include the requirements. For example if FreeRDP-Client is required WinPR and FreeRDP need to be included (find_package) as well. This commit also fixes the installation when STATIC_CHANNELS are built. WITH STATIC_CHANNELS all channels are linked into libfreerdp-client, for this all channels are generated as linker archive and linked together in the final step. Before the intermediate linker archives were, although not required and useful, installed. Same applies for server side channels.
Diffstat (limited to 'third-party')
-rw-r--r--third-party/.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/third-party/.gitignore b/third-party/.gitignore
index efc4279f7..bbf8a76fc 100644
--- a/third-party/.gitignore
+++ b/third-party/.gitignore
@@ -1,4 +1,5 @@
*
**/*
!CMakeLists.txt
+!*.pc.in