Author: kpvdr
Date: Tue Jan 26 14:36:43 2016
New Revision: 1726802
URL: http://svn.apache.org/viewvc?rev=1726802&view=rev
Log:
NO-JIRA: Added ability to build using Proton from built but not installed
location
Modified:
qpid/trunk/qpid/cpp/CMakeModules/FindProton.cmake
Modified: qpid/trunk/qpid/cpp/CMakeModules/FindProton.cmake
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeModules/FindProton.cmake?rev=1726802&r1=1726801&r2=1726802&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CMakeModules/FindProton.cmake (original)
+++ qpid/trunk/qpid/cpp/CMakeModules/FindProton.cmake Tue Jan 26 14:36:43 2016
@@ -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)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
