From cd8091a31578bb2596db44fd99f42f74682b3505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= Date: Thu, 16 May 2013 14:45:49 -0400 Subject: [PATCH] freerdp: fix monolithic build with Intel IPP linking --- libfreerdp/CMakeLists.txt | 9 +++++++++ libfreerdp/primitives/CMakeLists.txt | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt index b8b6adb28..42c06dd60 100644 --- a/libfreerdp/CMakeLists.txt +++ b/libfreerdp/CMakeLists.txt @@ -22,6 +22,15 @@ if(MONOLITHIC_BUILD) set(CMAKE_POSITION_INDEPENDENT_CODE ON) endif() +# Create imported targets for Intel IPP libraries + +if(IPP_FOUND) + foreach(ipp_lib ${IPP_LIBRARIES}) + add_library("${ipp_lib}_imported" STATIC IMPORTED) + set_property(TARGET "${ipp_lib}_imported" PROPERTY IMPORTED_LOCATION "${IPP_LIBRARY_DIRS}/${ipp_lib}") + endforeach() +endif() + set(${MODULE_PREFIX}_SUBMODULES utils common diff --git a/libfreerdp/primitives/CMakeLists.txt b/libfreerdp/primitives/CMakeLists.txt index d9db4da17..8aa327c80 100644 --- a/libfreerdp/primitives/CMakeLists.txt +++ b/libfreerdp/primitives/CMakeLists.txt @@ -76,8 +76,6 @@ set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVER if(IPP_FOUND) include_directories(${IPP_INCLUDE_DIRS}) foreach(ipp_lib ${IPP_LIBRARIES}) - add_library("${ipp_lib}_imported" STATIC IMPORTED) - set_property(TARGET "${ipp_lib}_imported" PROPERTY IMPORTED_LOCATION "${IPP_LIBRARY_DIRS}/${ipp_lib}") set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} "${ipp_lib}_imported") endforeach() endif()