From 3b0bcc98243a1cddf1b85b9b8205d7229202252b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Tue, 29 Oct 2013 15:16:44 -0400 Subject: [PATCH] cmake: export to different directory, export more build info --- CMakeLists.txt | 5 +++-- FreeRDPConfig.cmake.in | 3 ++- winpr/CMakeLists.txt | 5 +++-- winpr/WinPRConfig.cmake.in | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a319b17d6..8dc1e2224 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -558,13 +558,14 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10") export(PACKAGE freerdp) - set(FREERDP_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/FreeRDP/cmake") + set(FREERDP_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/FreeRDP") set(FREERDP_INCLUDE_DIR "include") + set(FREERDP_MONOLITHIC_BUILD ${MONOLITHIC_BUILD}) configure_package_config_file(FreeRDPConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FreeRDPConfig.cmake INSTALL_DESTINATION ${FREERDP_CMAKE_INSTALL_DIR} - PATH_VARS FREERDP_INCLUDE_DIR) + PATH_VARS FREERDP_INCLUDE_DIR FREERDP_MONOLITHIC_BUILD) write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/FreeRDPConfigVersion.cmake VERSION ${FREERDP_VERSION} COMPATIBILITY SameMajorVersion) diff --git a/FreeRDPConfig.cmake.in b/FreeRDPConfig.cmake.in index 9b8f9b9a8..7dcea99de 100644 --- a/FreeRDPConfig.cmake.in +++ b/FreeRDPConfig.cmake.in @@ -3,7 +3,8 @@ set(FreeRDP_VERSION_MAJOR "@FREERDP_VERSION_MAJOR@") set(FreeRDP_VERSION_MINOR "@FREERDP_VERSION_MINOR@") -set(FreeRDP_VERSION_PATCH "@FREERDP_VERSION_PATCH@") +set(FreeRDP_VERSION_REVISION "@FREERDP_VERSION_REVISION@") +set(FreeRDP_MONOLITHIC_BUILD "@FREERDP_MONOLITHIC_BUILD@") set_and_check(FreeRDP_INCLUDE_DIR "@PACKAGE_FREERDP_INCLUDE_DIR@") diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt index f19fe984d..c20a307c6 100644 --- a/winpr/CMakeLists.txt +++ b/winpr/CMakeLists.txt @@ -86,15 +86,16 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10") export(PACKAGE winpr) - set(WINPR_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/WinPR/cmake") + set(WINPR_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/WinPR") set(WINPR_INCLUDE_DIR "include") + set(WINPR_MONOLITHIC_BUILD ${MONOLITHIC_BUILD}) message(STATUS "WINPR_VERSION: ${WINPR_VERSION}") configure_package_config_file(WinPRConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/WinPRConfig.cmake INSTALL_DESTINATION ${WINPR_CMAKE_INSTALL_DIR} - PATH_VARS WINPR_INCLUDE_DIR) + PATH_VARS WINPR_INCLUDE_DIR WINPR_MONOLITHIC_BUILD) write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/WinPRConfigVersion.cmake VERSION ${WINPR_VERSION} COMPATIBILITY SameMajorVersion) diff --git a/winpr/WinPRConfig.cmake.in b/winpr/WinPRConfig.cmake.in index edf8091dd..3a7a6c005 100644 --- a/winpr/WinPRConfig.cmake.in +++ b/winpr/WinPRConfig.cmake.in @@ -3,7 +3,8 @@ set(WinPR_VERSION_MAJOR "@WINPR_VERSION_MAJOR@") set(WinPR_VERSION_MINOR "@WINPR_VERSION_MINOR@") -set(WinPR_VERSION_PATCH "@WINPR_VERSION_PATCH@") +set(WinPR_VERSION_REVISION "@WINPR_VERSION_REVISION@") +set(WinPR_MONOLITHIC_BUILD "@WINPR_MONOLITHIC_BUILD@") set_and_check(WinPR_INCLUDE_DIR "@PACKAGE_WINPR_INCLUDE_DIR@")