Merge pull request #254 from gitplcc/installdir

Use CMake GNUInstallDirs module for install directory inference

CMakeLists.txt

@@ -17,7 +17,7 @@
 
 # Note: on OS X you should install XCode and the associated command-line tools
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.4)
 PROJECT("paho" C)
 MESSAGE(STATUS "CMake version: " ${CMAKE_VERSION})
 MESSAGE(STATUS "CMake system name: " ${CMAKE_SYSTEM_NAME})
@@ -31,29 +31,11 @@ SET(PAHO_VERSION_MINOR 2)
 SET(PAHO_VERSION_PATCH 0)
 SET(CLIENT_VERSION ${PAHO_VERSION_MAJOR}.${PAHO_VERSION_MINOR}.${PAHO_VERSION_PATCH})
 
+INCLUDE(GNUInstallDirs)
+
 STRING(TIMESTAMP BUILD_TIMESTAMP UTC)
 MESSAGE(STATUS "Timestamp is ${BUILD_TIMESTAMP}")
 
-# Uses the correct directory for libraries on Red Hat-based distributions.
-SET(PAHO_LIBRARY_DIR_NAME "lib")
-IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  IF(EXISTS "/etc/redhat-release")
-    IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    	SET(PAHO_LIBRARY_DIR_NAME "lib64")
-    ENDIF()
-  ENDIF()
-ENDIF()
-
-# Uses the correct directory for libraries on Red Hat-based distributions.
-SET(PAHO_LIBRARY_DIR_NAME "lib")
-IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  IF(EXISTS "/etc/redhat-release")
-    IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    	SET(PAHO_LIBRARY_DIR_NAME "lib64")
-    ENDIF()
-  ENDIF()
-ENDIF()
-
 IF(WIN32)
   ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -DWIN32_LEAN_AND_MEAN -MD)
 ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")

src/CMakeLists.txt

@@ -80,11 +80,11 @@ SET_TARGET_PROPERTIES(
     SOVERSION ${PAHO_VERSION_MAJOR})
 
 INSTALL(TARGETS paho-mqtt3c paho-mqtt3a
-    RUNTIME DESTINATION bin
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION ${PAHO_LIBRARY_DIR_NAME})
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 INSTALL(TARGETS MQTTVersion
-    RUNTIME DESTINATION bin)
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 IF (PAHO_BUILD_STATIC)
     ADD_LIBRARY(paho-mqtt3c-static STATIC $<TARGET_OBJECTS:common_obj> MQTTClient.c)
@@ -94,13 +94,11 @@ IF (PAHO_BUILD_STATIC)
     TARGET_LINK_LIBRARIES(paho-mqtt3a-static ${LIBS_SYSTEM})
 
     INSTALL(TARGETS paho-mqtt3c-static paho-mqtt3a-static
-        RUNTIME DESTINATION bin
-        ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION ${PAHO_LIBRARY_DIR_NAME})
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 ENDIF()
 
 INSTALL(FILES MQTTAsync.h MQTTClient.h MQTTClientPersistence.h
-    DESTINATION include)
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 IF (PAHO_WITH_SSL)
     SET(OPENSSL_SEARCH_PATH "" CACHE PATH "Directory containing OpenSSL libraries and includes")
@@ -145,9 +143,9 @@ IF (PAHO_WITH_SSL)
         SOVERSION ${PAHO_VERSION_MAJOR}
         COMPILE_DEFINITIONS "OPENSSL=1")
     INSTALL(TARGETS paho-mqtt3cs paho-mqtt3as
-        RUNTIME DESTINATION bin
-        ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION  ${PAHO_LIBRARY_DIR_NAME})
+        ARCHIVE DESTINATION  ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY DESTINATION  ${CMAKE_INSTALL_LIBDIR}
+        RUNTIME DESTINATION  ${CMAKE_INSTALL_BINDIR})
 
     IF (PAHO_BUILD_STATIC)
         ADD_LIBRARY(paho-mqtt3cs-static STATIC $<TARGET_OBJECTS:common_ssl_obj> MQTTClient.c SSLSocket.c)
@@ -162,8 +160,6 @@ IF (PAHO_WITH_SSL)
         COMPILE_DEFINITIONS "OPENSSL=1")
 
         INSTALL(TARGETS paho-mqtt3cs-static paho-mqtt3as-static
-            RUNTIME DESTINATION bin
-            ARCHIVE DESTINATION lib
-            LIBRARY DESTINATION  ${PAHO_LIBRARY_DIR_NAME})
+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
     ENDIF()
 ENDIF()

src/samples/CMakeLists.txt

@@ -61,5 +61,5 @@ INSTALL(TARGETS paho_c_sub
                 MQTTClient_publish
                 MQTTClient_publish_async
 
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION ${PAHO_LIBRARY_DIR_NAME})
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})