[qpid-cpp] branch master updated: QPID-8390> Corrected FindProton.cmake relative path search (#22)

[jdanek]

This is an automated email from the ASF dual-hosted git repository.

jdanek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-cpp.git


The following commit(s) were added to refs/heads/master by this push:
     new 8e054e0  QPID-8390> Corrected FindProton.cmake relative path search 
(#22)
8e054e0 is described below

commit 8e054e04e76ab24183ce7551f5e34a4ccfe8186e
Author: Chris Richardson <chris.richard...@fourc.eu>
AuthorDate: Fri Dec 18 19:07:50 2020 +0000

    QPID-8390> Corrected FindProton.cmake relative path search (#22)
---
 CMakeModules/FindProton.cmake | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeModules/FindProton.cmake b/CMakeModules/FindProton.cmake
index dcbdb28..cda67b6 100644
--- a/CMakeModules/FindProton.cmake
+++ b/CMakeModules/FindProton.cmake
@@ -51,14 +51,14 @@ 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
+# Allow cmake or command-line to set checked out but not installed Proton 
location
+# Default 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-core.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_Core_LIBRARIES 
"${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/libqpid-proton-core.so")
+if (EXISTS 
${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/c/libqpid-proton-core.so)
+    
include("${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/c/ProtonConfig.cmake")
+    set (Proton_INCLUDE_DIRS "${Proton_CHECKOUT_DIR}/c/include" 
"${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/c/include")
+    set (Proton_Core_LIBRARIES 
"${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/c/libqpid-proton-core.so")
     find_package_message(Proton "Found uninstalled Proton: 
${Proton_Core_LIBRARIES} (found version \"${Proton_VERSION}\")" "$ProtonX_DIR 
${Proton_Core_LIBRARIES} $Proton_VERSION")
     return()
 endif ()


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org