Author: rhs
Date: Wed Oct 3 11:03:21 2012
New Revision: 1393409
URL: http://svn.apache.org/viewvc?rev=1393409&view=rev
Log:
PROTON-48: applied patch for libdir macro
Modified:
qpid/proton/trunk/proton-c/CMakeLists.txt
Modified: qpid/proton/trunk/proton-c/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/CMakeLists.txt?rev=1393409&r1=1393408&r2=1393409&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Wed Oct 3 11:03:21 2012
@@ -7,7 +7,17 @@ set (PN_VERSION_MINOR 1)
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (EXEC_PREFIX ${CMAKE_INSTALL_PREFIX})
-set (LIBDIR ${CMAKE_INSTALL_PREFIX}/lib CACHE STRING "Library directory")
+
+if ("${LIB_INSTALL_DIR}" STREQUAL "")
+ set (PROTON_INSTALL_LIBDIR lib CACHE STRING
+ "Directory where library files are installed")
+else()
+ set (PROTON_INSTALL_LIBDIR ${LIB_INSTALL_DIR} CACHE STRING
+ "Directory where library files are installed")
+endif()
+
+set (LIBDIR ${CMAKE_INSTALL_PREFIX}/${PROTON_INSTALL_LIBDIR} CACHE STRING
+ "Library directory")
set (INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include)
set (PN_VERSION "${PN_VERSION_MAJOR}.${PN_VERSION_MINOR}")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
