You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2013/02/20 16:30:32 UTC
svn commit: r1448232 - in /qpid/proton/trunk: CMakeLists.txt
proton-c/CMakeLists.txt
Author: rhs
Date: Wed Feb 20 15:30:31 2013
New Revision: 1448232
URL: http://svn.apache.org/r1448232
Log:
PROTON-243: fixed LIB_SUFFIX magic
Modified:
qpid/proton/trunk/CMakeLists.txt
qpid/proton/trunk/proton-c/CMakeLists.txt
Modified: qpid/proton/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/CMakeLists.txt?rev=1448232&r1=1448231&r2=1448232&view=diff
==============================================================================
--- qpid/proton/trunk/CMakeLists.txt (original)
+++ qpid/proton/trunk/CMakeLists.txt Wed Feb 20 15:30:31 2013
@@ -43,6 +43,25 @@ enable_testing()
include (CTest)
set (pn_test_root "${CMAKE_CURRENT_SOURCE_DIR}/tests")
+
+# In rpm builds the build sets some variables:
+# CMAKE_INSTALL_PREFIX - this is a standard cmake variable
+# INCLUDE_INSTALL_DIR
+# LIB_INSTALL_DIR
+# SYSCONF_INSTALL_DIR
+# SHARE_INSTALL_DIR
+# So make these cached variables and the specific variables non cached
+# and derived from them.
+
+if (NOT DEFINED LIB_SUFFIX)
+ get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
+ if ("${LIB64}" STREQUAL "TRUE" AND ${CMAKE_SIZEOF_VOID_P} STREQUAL "8")
+ set(LIB_SUFFIX 64)
+ else()
+ set(LIB_SUFFIX "")
+ endif()
+endif()
+
# Start of variables used during install
set (INCLUDE_INSTALL_DIR include CACHE PATH "Include file directory")
set (LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Library object file directory")
Modified: qpid/proton/trunk/proton-c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/CMakeLists.txt?rev=1448232&r1=1448231&r2=1448232&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Wed Feb 20 15:30:31 2013
@@ -28,25 +28,6 @@ if(WIN32 AND NOT CYGWIN)
set (PLATFORM_LIBS ws2_32 Rpcrt4)
endif(WIN32 AND NOT CYGWIN)
-
-# In rpm builds the build sets some variables:
-# CMAKE_INSTALL_PREFIX - this is a standard cmake variable
-# INCLUDE_INSTALL_DIR
-# LIB_INSTALL_DIR
-# SYSCONF_INSTALL_DIR
-# SHARE_INSTALL_DIR
-# So make these cached variables and the specific variables non cached
-# and derived from them.
-
-if (NOT DEFINED LIB_SUFFIX)
- get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
- if ("${LIB64}" STREQUAL "TRUE" AND ${CMAKE_SIZEOF_VOID_P} STREQUAL "8")
- set(LIB_SUFFIX 64)
- else()
- set(LIB_SUFFIX "")
- endif()
-endif()
-
# Can't use ${CMAKE_VERSION) as it is not available in all versions of cmake 2.6
if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.8.0")
# OPTIONAL does not exist in install before 2.8 so always make docs and install
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org