From d68827e2b28356042e582250c840189e339e5076 Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Tue, 13 Jul 2010 15:22:30 +0000 Subject: QPID-2728 - Patch from Chuck Rolke Fix recent changes to CMake build to properly handle separate source/build directories git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@963759 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index 77b894459b..59a2d6a4c9 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -108,7 +108,7 @@ MACRO (add_msvc_version_full verProject verProjectType verProjectFileExt verFN1 set ("winverOriginalFilename" "${winver_${verProject}_OriginalFilename}") set ("winverProductName" "${winver_${verProject}_ProductName}") - configure_file(windows/resources/template-resource.rc + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/windows/resources/template-resource.rc windows/resources/${verProject}-resource.rc) set (${verProject}_SOURCES ${${verProject}_SOURCES} @@ -437,6 +437,7 @@ if (MSVC) set(Boost_FILESYSTEM_LIBRARY "") set(Boost_UNIT_TEST_FRAMEWORK_LIBRARY "") set(Boost_REGEX_LIBRARY "") + include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/windows/resources ) endif (MSVC) include_directories( ${Boost_INCLUDE_DIR} ) -- cgit v1.2.1