Author: astitcher
Date: Fri Oct 12 15:09:47 2012
New Revision: 1397608
URL: http://svn.apache.org/viewvc?rev=1397608&view=rev
Log:
PROTON-48: Rework choosing architecture lib directory
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=1397608&r1=1397607&r2=1397608&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Fri Oct 12 15:09:47 2012
@@ -8,16 +8,9 @@ set (PN_VERSION_MINOR 1)
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (EXEC_PREFIX ${CMAKE_INSTALL_PREFIX})
-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 (ARCHLIBDIR lib CACHE STRING
+ "Architecture specific library directory")
+set (LIBDIR ${CMAKE_INSTALL_PREFIX}/${ARCHLIBDIR})
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]
