diff options
| author | Ted Ross <tross@apache.org> | 2010-07-13 15:22:30 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2010-07-13 15:22:30 +0000 |
| commit | b63e65661d7946cae56d3cdd6e349b9c25dc3e6a (patch) | |
| tree | 8d715fcaecafaaa1392d16584128e4680ef1e997 /cpp | |
| parent | 824d7dc9190ce62e9629f6c9426ee8f38d9edc44 (diff) | |
| download | qpid-python-b63e65661d7946cae56d3cdd6e349b9c25dc3e6a.tar.gz | |
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/qpid@963759 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index 77b894459b..59a2d6a4c9 100644 --- a/cpp/src/CMakeLists.txt +++ b/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} ) |