From e97f76a031812d8da1c521d4d8c35a3aa14759c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Wed, 17 Oct 2012 18:14:35 -0400 Subject: [PATCH] cmake: fix deb cpack generator --- .gitignore | 2 ++ CMakeLists.txt | 14 ++++++++++++-- freerdp.pc.in | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cf8fb726a..93fab928b 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,8 @@ _CPack_Packages *.zip *.exe *.sh +*.deb +*.rpm *.tar.Z *.tar.gz diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d37ee0ab..5881087cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -307,6 +307,13 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${FREERDP_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${FREERDP_VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_PATCH ${FREERDP_VERSION_REVISION}) +set(CPACK_SET_DESTDIR "on") +set(CPACK_PACKAGING_INSTALL_PREFIX "/tmp") + +set(CPACK_PACKAGE_CONTACT "Marc-Andre Moreau") +set(CPACK_DEBIAN_PACKAGE_MAINTAINER "marcandre.moreau@gmail.com") +set(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR}) + set(CPACK_PACKAGE_INSTALL_DIRECTORY "FreeRDP") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/LICENSE") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") @@ -316,8 +323,10 @@ set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources\\\\FreeRDP_Install.bmp") set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/resources\\\\FreeRDP_Icon_96px.ico") set(CPACK_NSIS_MUI_UNICON "${CMAKE_SOURCE_DIR}/resource\\\\FreeRDP_Icon_96px.ico") -if(${MSVC_RUNTIME} STREQUAL "dynamic") - include(InstallRequiredSystemLibraries) +if(MSVC) + if(MSVC_RUNTIME STREQUAL "dynamic") + include(InstallRequiredSystemLibraries) + endif() endif() include(CPack) @@ -327,3 +336,4 @@ cpack_add_component(libraries DISPLAY_NAME "Libraries") cpack_add_component(clients DISPLAY_NAME "Clients") set(CPACK_COMPONENTS_ALL clients libraries headers) + diff --git a/freerdp.pc.in b/freerdp.pc.in index 08be9d138..da43af7b9 100644 --- a/freerdp.pc.in +++ b/freerdp.pc.in @@ -8,6 +8,6 @@ Description: A free remote desktop protocol client URL: http://www.freerdp.com/ Version: @FREERDP_VERSION_FULL@ Requires: -Libs: -L${libdir} -lfreerdp-cache -lfreerdp-channels -lfreerdp-codec -lfreerdp-core -lfreerdp-crypto -lfreerdp-gdi -lfreerdp-locale -lfreerdp-rail -lfreerdp-utils -lwinpr-sspi -lwinpr-rpc +Libs: -L${libdir} -lfreerdp-cache -lfreerdp-codec -lfreerdp-core -lfreerdp-crypto -lfreerdp-gdi -lfreerdp-locale -lfreerdp-rail -lfreerdp-utils -lwinpr-sspi -lwinpr-rpc Cflags: -I${includedir}