From 39e64c5808e4ffc04197644afd87f2dd0db3350b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc-Andr=C3=A9=20Moreau?= Date: Mon, 10 Feb 2014 21:07:05 -0500 Subject: [PATCH] wfreerdp: fix monolithic static build --- CMakeLists.txt | 1 + libfreerdp/CMakeLists.txt | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 76bbdf2..13265f1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,6 +213,7 @@ if(IOS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -isysroot ${CMAKE_IOS_SDK_ROOT} -g") endif() +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWINPR_EXPORTS") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFREERDP_EXPORTS") # Include files diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt index cea42c1..339cea3 100644 --- a/libfreerdp/CMakeLists.txt +++ b/libfreerdp/CMakeLists.txt @@ -58,7 +58,10 @@ if(MONOLITHIC_BUILD) set_target_properties(${MODULE_NAME} PROPERTIES LINKER_LANGUAGE C) set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib") - target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${PROFILER_LIBRARIES}) + list(APPEND FREERDP_LIBS ${PROFILER_LIBRARIES}) + list(REMOVE_DUPLICATES FREERDP_LIBS) + + target_link_libraries(${MODULE_NAME} ${FREERDP_LIBS}) install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets) -- 2.7.4