mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfreerdp: fix linking libraries for monolithic build

Browse Source
This commit is contained in:
Marc-André Moreau 2012-08-14 00:31:06 -04:00
parent bccc9cb8f5
commit c56f7064f2
10 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libfreerdp/CMakeLists.txt
View File

@ -40,4 +40,8 @@ if(WITH_MONOLITHIC_BUILD)
$<TARGET_OBJECTS:freerdp-channels>
$<TARGET_OBJECTS:freerdp-locale>
$<TARGET_OBJECTS:freerdp-core>)
target_link_libraries(freerdp ${FREERDP_LIBS})
endif()

2
libfreerdp/cache/CMakeLists.txt vendored
View File

@ -38,7 +38,7 @@ set_target_properties(freerdp-cache PROPERTIES VERSION ${FREERDP_VERSION_FULL} S
set(FREERDP_CACHE_LIBS)
if(WITH_MONOLITHIC_BUILD)
set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_CACHE_LIBS} PARENT_SCOPE)
else()
set(FREERDP_CACHE_LIBS ${FREERDP_CACHE_LIBS}
freerdp-core

2
libfreerdp/channels/CMakeLists.txt
View File

@ -34,7 +34,7 @@ set_target_properties(freerdp-channels PROPERTIES VERSION ${FREERDP_VERSION_FULL
set(FREERDP_CHANNELS_LIBS)
if(WITH_MONOLITHIC_BUILD)
set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_CHANNELS_LIBS} PARENT_SCOPE)
else()
set(FREERDP_CHANNELS_LIBS ${FREERDP_CHANNELS_LIBS}
freerdp-utils)

2
libfreerdp/codec/CMakeLists.txt
View File

@ -89,7 +89,7 @@ set(FREERDP_CODEC_LIBS
${FREERDP_JPEG_LIBS})
if(WITH_MONOLITHIC_BUILD)
set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_CODEC_LIBS} PARENT_SCOPE)
else()
set(FREERDP_CODEC_LIBS ${FREERDP_CODEC_LIBS}
freerdp-utils)

2
libfreerdp/core/CMakeLists.txt
View File

@ -117,7 +117,7 @@ endif()
set(FREERDP_CORE_LIBS ${FREERDP_CORE_LIBS} ${OPENSSL_LIBRARIES})
if(WITH_MONOLITHIC_BUILD)
set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_CORE_LIBS} PARENT_SCOPE)
else()
set(FREERDP_CORE_LIBS ${FREERDP_CORE_LIBS}
freerdp-utils

2
libfreerdp/crypto/CMakeLists.txt
View File

@ -50,7 +50,7 @@ else()
endif()
if(WITH_MONOLITHIC_BUILD)
set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_CRYPTO_LIBS} PARENT_SCOPE)
else()
set(FREERDP_CRYPTO_LIBS ${FREERDP_CRYPTO_LIBS} freerdp-utils)
target_link_libraries(freerdp-crypto ${FREERDP_CRYPTO_LIBS})

2
libfreerdp/gdi/CMakeLists.txt
View File

@ -49,7 +49,7 @@ set_target_properties(freerdp-gdi PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOV
set(FREERDP_GDI_LIBS)
if(WITH_MONOLITHIC_BUILD)
set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_GDI_LIBS} PARENT_SCOPE)
else()
set(FREERDP_GDI_LIBS ${FREERDP_GDI_LIBS}
freerdp-core

2
libfreerdp/locale/CMakeLists.txt
View File

@ -82,7 +82,7 @@ endif()
set_target_properties(freerdp-locale PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
if(WITH_MONOLITHIC_BUILD)
set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_LOCALE_LIBS} PARENT_SCOPE)
else()
set(FREERDP_LOCALE_LIBS ${FREERDP_LOCALE_LIBS} freerdp-utils)
target_link_libraries(freerdp-locale ${FREERDP_LOCALE_LIBS})

2
libfreerdp/rail/CMakeLists.txt
View File

@ -35,7 +35,7 @@ set_target_properties(freerdp-rail PROPERTIES VERSION ${FREERDP_VERSION_FULL} SO
set(FREERDP_RAIL_LIBS)
if(WITH_MONOLITHIC_BUILD)
set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_RAIL_LIBS} PARENT_SCOPE)
else()
set(FREERDP_RAIL_LIBS ${FREERDP_RAIL_LIBS} freerdp-utils)
target_link_libraries(freerdp-rail ${FREERDP_RAIL_LIBS})

2
libfreerdp/utils/CMakeLists.txt
View File

@ -72,7 +72,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES SunOS)
endif()
if(WITH_MONOLITHIC_BUILD)
set(FREERDP_LIBS ${FREERDP_LIBS} ${FREERDP_UTILS_LIBS} PARENT_SCOPE)
else()
target_link_libraries(freerdp-utils ${FREERDP_UTILS_LIBS})
install(TARGETS freerdp-utils DESTINATION ${CMAKE_INSTALL_LIBDIR})