Use SetFreeRDPCMakeInstallDir where CMake modules are installed

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 166847e..4c2e4df 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -89,7 +89,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
 
        export(PACKAGE freerdp-client)
 
-       set(FREERDP_CLIENT_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/FreeRDP-Client${FREERDP_VERSION_MAJOR}")
+       SetFreeRDPCMakeInstallDir(FREERDP_CLIENT_CMAKE_INSTALL_DIR "FreeRDP-Client${FREERDP_VERSION_MAJOR}")
 
        configure_package_config_file(FreeRDP-ClientConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FreeRDP-ClientConfig.cmake
                INSTALL_DESTINATION ${FREERDP_CLIENT_CMAKE_INSTALL_DIR}

diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
index e6095f6..bb1f31a 100644 (file)
--- a/libfreerdp/CMakeLists.txt
+++ b/libfreerdp/CMakeLists.txt
@@ -340,7 +340,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
 
        export(PACKAGE freerdp)
 
-       set(FREERDP_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/FreeRDP${FREERDP_VERSION_MAJOR}")
+       SetFreeRDPCMakeInstallDir(FREERDP_CMAKE_INSTALL_DIR "FreeRDP${FREERDP_VERSION_MAJOR}")
 
        configure_package_config_file(FreeRDPConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FreeRDPConfig.cmake
                INSTALL_DESTINATION ${FREERDP_CMAKE_INSTALL_DIR}

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 65e5c51..73d39f7 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -71,7 +71,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
 
        export(PACKAGE freerdp-server)
 
-       set(FREERDP_SERVER_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/FreeRDP-Server${FREERDP_VERSION_MAJOR}")
+       SetFreeRDPCMakeInstallDir(FREERDP_SERVER_CMAKE_INSTALL_DIR "FreeRDP-Server${FREERDP_VERSION_MAJOR}")
 
        configure_package_config_file(FreeRDP-ServerConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FreeRDP-ServerConfig.cmake
                INSTALL_DESTINATION ${FREERDP_SERVER_CMAKE_INSTALL_DIR}

diff --git a/server/shadow/CMakeLists.txt b/server/shadow/CMakeLists.txt
index 65b8430..3e0df0b 100644 (file)
--- a/server/shadow/CMakeLists.txt
+++ b/server/shadow/CMakeLists.txt
@@ -349,7 +349,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
 
        export(PACKAGE freerdp-shadow)
 
-       set(FREERDP_SERVER_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/FreeRDP-Shadow${FREERDP_VERSION_MAJOR}")
+       SetFreeRDPCMakeInstallDir(FREERDP_SERVER_CMAKE_INSTALL_DIR "FreeRDP-Shadow${FREERDP_VERSION_MAJOR}")
 
        configure_package_config_file(FreeRDP-ShadowConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FreeRDP-ShadowConfig.cmake
                INSTALL_DESTINATION ${FREERDP_SERVER_CMAKE_INSTALL_DIR}

diff --git a/uwac/CMakeLists.txt b/uwac/CMakeLists.txt
index 369ba2d..c75d044 100644 (file)
--- a/uwac/CMakeLists.txt
+++ b/uwac/CMakeLists.txt
@@ -32,7 +32,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
 
        export(PACKAGE uwac)
 
-       set(UWAC_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/uwac${UWAC_VERSION_MAJOR}")
+       SetFreeRDPCMakeInstallDir(UWAC_CMAKE_INSTALL_DIR "uwac${UWAC_VERSION_MAJOR}")
 
 
        configure_package_config_file(uwacConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/uwacConfig.cmake

diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt
index e56b3ad..6d0b559 100644 (file)
--- a/winpr/CMakeLists.txt
+++ b/winpr/CMakeLists.txt
@@ -187,7 +187,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10")
 
        export(PACKAGE winpr)
 
-       set(WINPR_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/WinPR${WINPR_VERSION_MAJOR}")
+       SetFreeRDPCMakeInstallDir(WINPR_CMAKE_INSTALL_DIR "WinPR${WINPR_VERSION_MAJOR}")
 
        set(WINPR_INCLUDE_DIR "include/winpr${WINPR_VERSION_MAJOR}")