diff options
| author | Antenore Gatta <antenore@simbiosi.org> | 2016-01-17 00:19:45 +0300 |
|---|---|---|
| committer | Antenore Gatta <antenore@simbiosi.org> | 2016-01-17 00:19:45 +0300 |
| commit | 423699a3fd9e78fe20fce0b5e0648c925b06bad1 (patch) | |
| tree | 4347c2491432b2f2e1cb3738942583d90aa3ee2a /cmake | |
| parent | 0f8268dac985c9e9ce9a46b3f74121a4e12745a6 (diff) | |
| parent | 93be2df6a845d5c46580fc7398f0b7f3eeb333d9 (diff) | |
fixing conglicts between next and survey
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindFREERDP.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmake/FindFREERDP.cmake b/cmake/FindFREERDP.cmake index c98510d44..986703b4a 100644 --- a/cmake/FindFREERDP.cmake +++ b/cmake/FindFREERDP.cmake @@ -25,7 +25,10 @@ endif() set(FREERDP_DEFINITIONS ${PC_FREERDP_CFLAGS_OTHER}) find_path(FREERDP_INCLUDE_DIR NAMES freerdp/freerdp.h - HINTS ${PC_FREERDP_INCLUDEDIR} ${PC_FREERDP_INCLUDE_DIRS}) + HINTS ${PC_FREERDP_INCLUDEDIR} ${PC_FREERDP_INCLUDE_DIRS} ${CMAKE_PREFIX_PATH}/include/freerdp2/) + +find_path(WINPR_INCLUDE_DIR NAMES winpr/winpr.h + HINTS ${PC_FREERDP_INCLUDEDIR} ${PC_FREERDP_INCLUDE_DIRS} ${CMAKE_PREFIX_PATH}/include/winpr1/) find_library(FREERDP_LIBRARY NAMES freerdp2 HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS}) @@ -41,6 +44,6 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(FREERDP DEFAULT_MSG FREERDP_LIBRARY FREERDP_INCLUDE_DIR) set(FREERDP_LIBRARIES ${FREERDP_LIBRARY} ${FREERDP_CLIENT_LIBRARY} ${FREERDP_WINPR_LIBRARY} ) -set(FREERDP_INCLUDE_DIRS ${FREERDP_INCLUDE_DIR}) +set(FREERDP_INCLUDE_DIRS ${FREERDP_INCLUDE_DIR} ${WINPR_INCLUDE_DIR}) mark_as_advanced(FREERDP_INCLUDE_DIR FREERDP_LIBRARY) |