diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2016-01-26 14:36:43 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2016-01-26 14:36:43 +0000 |
| commit | 4da5242913b3bb6c2fc478bc18fe8dc13fa74833 (patch) | |
| tree | cf76f9aa3e70a39c447203b76b7bd21f5ee9f8ac | |
| parent | 3cc8d79db7ffdc71658873d7b82601a4499bc08b (diff) | |
| download | qpid-python-4da5242913b3bb6c2fc478bc18fe8dc13fa74833.tar.gz | |
NO-JIRA: Added ability to build using Proton from built but not installed location
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1726802 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/CMakeModules/FindProton.cmake | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/qpid/cpp/CMakeModules/FindProton.cmake b/qpid/cpp/CMakeModules/FindProton.cmake index 39792e9d6f..71441fe1a7 100644 --- a/qpid/cpp/CMakeModules/FindProton.cmake +++ b/qpid/cpp/CMakeModules/FindProton.cmake @@ -64,6 +64,18 @@ if (PKG_CONFIG_FOUND) endif () endif() +# Allow ccmake or command-line to set checked out but not installed Proton location +# Defaule location is ${HOME}/qpid-proton +set(Proton_CHECKOUT_DIR "$ENV{HOME}/qpid-proton" CACHE PATH "Proton checkout directory") +set(Proton_BUILD_DIR_NAME "build" CACHE STRING "Proton build directory name within Proton_CHECKOUT_DIR") +if (EXISTS ${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/libqpid-proton.so) + include("${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/ProtonConfig.cmake") + set (Proton_INCLUDE_DIRS "${Proton_CHECKOUT_DIR}/proton-c/include" "${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/include") + set (Proton_LIBRARIES "${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/libqpid-proton.so") + find_package_message(Proton "Found uninstalled Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$ProtonX_DIR ${Proton_LIBRARIES} $Proton_VERSION") + return() +endif () + # Proton not found print a standard error message if (NOT ${CMAKE_VERSION} VERSION_LESS "2.8.3") find_package_handle_standard_args(Proton CONFIG_MODE) |