From b627dbb35c5bf04c9e92764466e4969315e05d24 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Thu, 25 Aug 2011 00:00:24 -0400 Subject: [PATCH] Allow linux distros to override LIBDIR; fix xfreerdp install --- CMakeLists.txt | 7 ++++++- client/X11/CMakeLists.txt | 4 ++-- libfreerdp-cache/CMakeLists.txt | 2 +- libfreerdp-chanman/CMakeLists.txt | 2 +- libfreerdp-core/CMakeLists.txt | 2 +- libfreerdp-gdi/CMakeLists.txt | 2 +- libfreerdp-kbd/CMakeLists.txt | 2 +- libfreerdp-rail/CMakeLists.txt | 2 +- libfreerdp-rfx/CMakeLists.txt | 2 +- libfreerdp-utils/CMakeLists.txt | 2 +- 10 files changed, 16 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c7a9fce5..23068d831 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,6 +46,11 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release") endif() +# Set default libdir +if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR "lib") +endif() + # Compiler-specific flags if(CMAKE_COMPILER_IS_GNUCC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-unused-but-set-variable") @@ -90,7 +95,7 @@ test_big_endian(BIG_ENDIAN) set(FREERDP_KEYMAP_PATH "${CMAKE_INSTALL_PREFIX}/freerdp/keymaps") # Path to put plugins -set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/lib/freerdp") +set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/freerdp") # Include directories include_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt index c06005f0a..f5754f2cf 100644 --- a/client/X11/CMakeLists.txt +++ b/client/X11/CMakeLists.txt @@ -52,8 +52,6 @@ if(Xcursor_FOUND) target_link_libraries(xfreerdp ${Xext_LIBRARIES}) endif() -INSTALL_PROGRAMS(/bin FILES xfreerdp) - target_link_libraries(xfreerdp freerdp-core) target_link_libraries(xfreerdp freerdp-gdi) target_link_libraries(xfreerdp freerdp-kbd) @@ -61,3 +59,5 @@ target_link_libraries(xfreerdp freerdp-rail) target_link_libraries(xfreerdp freerdp-chanman) target_link_libraries(xfreerdp freerdp-utils) target_link_libraries(xfreerdp ${X11_LIBRARIES}) + +install(TARGETS xfreerdp DESTINATION bin) diff --git a/libfreerdp-cache/CMakeLists.txt b/libfreerdp-cache/CMakeLists.txt index 8a7274ff2..413c600f0 100644 --- a/libfreerdp-cache/CMakeLists.txt +++ b/libfreerdp-cache/CMakeLists.txt @@ -32,4 +32,4 @@ set_target_properties(freerdp-cache PROPERTIES VERSION ${FREERDP_VERSION_FULL} S target_link_libraries(freerdp-cache freerdp-utils) -install(TARGETS freerdp-cache DESTINATION lib) +install(TARGETS freerdp-cache DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/libfreerdp-chanman/CMakeLists.txt b/libfreerdp-chanman/CMakeLists.txt index 11b2ad522..dae990491 100644 --- a/libfreerdp-chanman/CMakeLists.txt +++ b/libfreerdp-chanman/CMakeLists.txt @@ -26,5 +26,5 @@ add_library(freerdp-chanman SHARED ${FREERDP_CHANMAN_SRCS}) set_target_properties(freerdp-chanman PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") target_link_libraries(freerdp-chanman freerdp-utils) -install(TARGETS freerdp-chanman DESTINATION lib) +install(TARGETS freerdp-chanman DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/libfreerdp-core/CMakeLists.txt b/libfreerdp-core/CMakeLists.txt index 79b423551..ec44fe287 100644 --- a/libfreerdp-core/CMakeLists.txt +++ b/libfreerdp-core/CMakeLists.txt @@ -105,4 +105,4 @@ endif() target_link_libraries(freerdp-core ${OPENSSL_LIBRARIES}) target_link_libraries(freerdp-core freerdp-utils) -install(TARGETS freerdp-core DESTINATION lib) +install(TARGETS freerdp-core DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/libfreerdp-gdi/CMakeLists.txt b/libfreerdp-gdi/CMakeLists.txt index 8a347003a..c04c93ef6 100644 --- a/libfreerdp-gdi/CMakeLists.txt +++ b/libfreerdp-gdi/CMakeLists.txt @@ -41,4 +41,4 @@ target_link_libraries(freerdp-gdi freerdp-rfx) set_target_properties(freerdp-gdi PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") -install(TARGETS freerdp-gdi DESTINATION lib) +install(TARGETS freerdp-gdi DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/libfreerdp-kbd/CMakeLists.txt b/libfreerdp-kbd/CMakeLists.txt index a648ea668..cdb2e416b 100644 --- a/libfreerdp-kbd/CMakeLists.txt +++ b/libfreerdp-kbd/CMakeLists.txt @@ -40,5 +40,5 @@ add_definitions(-DKEYMAP_PATH="${FREERDP_KEYMAP_PATH}") set_target_properties(freerdp-kbd PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") -install(TARGETS freerdp-kbd DESTINATION lib) +install(TARGETS freerdp-kbd DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/libfreerdp-rail/CMakeLists.txt b/libfreerdp-rail/CMakeLists.txt index 3d2e7b1a7..1dbcad709 100644 --- a/libfreerdp-rail/CMakeLists.txt +++ b/libfreerdp-rail/CMakeLists.txt @@ -29,4 +29,4 @@ set_target_properties(freerdp-rail PROPERTIES VERSION ${FREERDP_VERSION_FULL} SO target_link_libraries(freerdp-rail freerdp-utils) -install(TARGETS freerdp-rail DESTINATION lib) +install(TARGETS freerdp-rail DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/libfreerdp-rfx/CMakeLists.txt b/libfreerdp-rfx/CMakeLists.txt index 339ace26c..d45c4336e 100644 --- a/libfreerdp-rfx/CMakeLists.txt +++ b/libfreerdp-rfx/CMakeLists.txt @@ -51,4 +51,4 @@ if(WITH_SSE2) target_link_libraries(freerdp-rfx freerdp-rfx-sse2) endif() -install(TARGETS freerdp-rfx DESTINATION lib) +install(TARGETS freerdp-rfx DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/libfreerdp-utils/CMakeLists.txt b/libfreerdp-utils/CMakeLists.txt index d2c9889be..a0b6037dd 100644 --- a/libfreerdp-utils/CMakeLists.txt +++ b/libfreerdp-utils/CMakeLists.txt @@ -54,4 +54,4 @@ if(WIN32) target_link_libraries(freerdp-utils ws2_32) endif() -install(TARGETS freerdp-utils DESTINATION lib) +install(TARGETS freerdp-utils DESTINATION ${CMAKE_INSTALL_LIBDIR})