Repository: qpid-proton Updated Branches: refs/heads/0.13.x 3a6b8c2f1 -> 404352047
PROTON-1208: Fix make install issues - Blocking issue that didn't install sufficient C++ binding header files - Don't install example files only used for building as part of full source Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/40435204 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/40435204 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/40435204 Branch: refs/heads/0.13.x Commit: 404352047be70408ae8c5a29044f45238e2eec5f Parents: 3a6b8c2 Author: Andrew Stitcher <[email protected]> Authored: Thu May 19 14:56:20 2016 -0400 Committer: Andrew Stitcher <[email protected]> Committed: Thu May 19 15:29:08 2016 -0400 ---------------------------------------------------------------------- CMakeLists.txt | 4 +++- proton-c/bindings/cpp/CMakeLists.txt | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/40435204/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index 02bd134..57a228a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,7 +159,9 @@ install (FILES LICENSE README.md TODO DESTINATION ${PROTON_SHARE}) install (DIRECTORY examples - DESTINATION ${PROTON_SHARE}) + DESTINATION ${PROTON_SHARE} + REGEX "/examples/CMakeLists.txt$" EXCLUDE + PATTERN "*Config.cmake" EXCLUDE) # add relevant CTest support find_program (MAVEN_EXE mvn DOC "Location of the maven program") http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/40435204/proton-c/bindings/cpp/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/proton-c/bindings/cpp/CMakeLists.txt b/proton-c/bindings/cpp/CMakeLists.txt index e18d4b9..983fa8b 100644 --- a/proton-c/bindings/cpp/CMakeLists.txt +++ b/proton-c/bindings/cpp/CMakeLists.txt @@ -118,9 +118,7 @@ if (MSVC) OPTIONAL) endif (MSVC) -# Install header files -file(GLOB headers "include/proton/*.hpp") -install (FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR}/proton) +install (DIRECTORY "include/proton" DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.hpp") add_subdirectory(docs) add_subdirectory(${CMAKE_SOURCE_DIR}/tests/tools/apps/cpp ${CMAKE_BINARY_DIR}/tests/tools/apps/cpp) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
