From 20cd361fc59bbf05f4e0a83509705505c54c5001 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Mon, 12 Aug 2013 13:51:18 +0200 Subject: [PATCH] winpr config.h now generated in binary tree. --- CMakeLists.txt | 4 ++-- winpr/CMakeLists.txt | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fcfcaf4c..5822b82fa 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -436,8 +436,8 @@ if(BUILD_TESTING) endif() # WinPR -set(WINPR_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/winpr/include") -include_directories(${WINPR_INCLUDE_DIR}) +include_directories("${CMAKE_SOURCE_DIR}/winpr/include") +include_directories("${CMAKE_BINARY_DIR}/winpr/include") add_subdirectory(winpr) diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt index 226291f57..b4aaf45d2 100644 --- a/winpr/CMakeLists.txt +++ b/winpr/CMakeLists.txt @@ -63,11 +63,14 @@ endif() if(FREERDP_BUILD) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include PARENT_SCOPE) + include_directories(${CMAKE_CURRENT_BINARY_DIR}/include PARENT_SCOPE) else() include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) + include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) endif() -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/winpr/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/include/winpr/config.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/winpr/config.h.in + ${CMAKE_CURRENT_BINARY_DIR}/include/winpr/config.h) add_subdirectory(include)