Some CMake cleanup & correction #223

CMakeLists.txt

@@ -27,21 +27,9 @@ SET(PAHO_VERSION_MINOR 1)
 SET(PAHO_VERSION_PATCH 0)
 SET(CLIENT_VERSION ${PAHO_VERSION_MAJOR}.${PAHO_VERSION_MINOR}.${PAHO_VERSION_PATCH})
 
-
-EXECUTE_PROCESS(COMMAND date -u OUTPUT_VARIABLE BUILD_TIMESTAMP)
-
-IF (BUILD_TIMESTAMP STREQUAL "")
-	MESSAGE(WARNING "Unable to determine build timestamp via default mechanism.")
-
-	IF (WIN32)
-		EXECUTE_PROCESS(COMMAND "cmd.exe" "/c" echo %DATE% %TIME% OUTPUT_VARIABLE BUILD_TIMESTAMP)
-	ENDIF()
-ENDIF()
-
-STRING(STRIP ${BUILD_TIMESTAMP} BUILD_TIMESTAMP)
+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")

src/CMakeLists.txt

@@ -80,6 +80,7 @@ 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})
 INSTALL(TARGETS MQTTVersion
@@ -92,12 +93,10 @@ IF (PAHO_BUILD_STATIC)
     TARGET_LINK_LIBRARIES(paho-mqtt3c-static ${LIBS_SYSTEM})
     TARGET_LINK_LIBRARIES(paho-mqtt3a-static ${LIBS_SYSTEM})
 
-    INSTALL(TARGETS paho-mqtt3c-static
+    INSTALL(TARGETS paho-mqtt3c-static paho-mqtt3a-static
+        RUNTIME DESTINATION bin
         ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION lib)
-    INSTALL(TARGETS paho-mqtt3a-static
-        ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION lib)
+        LIBRARY DESTINATION ${PAHO_LIBRARY_DIR_NAME})
 ENDIF()
 
 INSTALL(FILES MQTTAsync.h MQTTClient.h MQTTClientPersistence.h
@@ -145,10 +144,8 @@ IF (PAHO_WITH_SSL)
         VERSION ${CLIENT_VERSION}
         SOVERSION ${PAHO_VERSION_MAJOR}
         COMPILE_DEFINITIONS "OPENSSL=1")
-    INSTALL(TARGETS paho-mqtt3cs
-        ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION  ${PAHO_LIBRARY_DIR_NAME})
-    INSTALL(TARGETS paho-mqtt3as
+    INSTALL(TARGETS paho-mqtt3cs paho-mqtt3as
+        RUNTIME DESTINATION bin
         ARCHIVE DESTINATION lib
         LIBRARY DESTINATION  ${PAHO_LIBRARY_DIR_NAME})
 
@@ -164,10 +161,8 @@ IF (PAHO_WITH_SSL)
         SOVERSION ${PAHO_VERSION_MAJOR}
         COMPILE_DEFINITIONS "OPENSSL=1")
 
-        INSTALL(TARGETS paho-mqtt3cs-static
-            ARCHIVE DESTINATION lib
-            LIBRARY DESTINATION  ${PAHO_LIBRARY_DIR_NAME})
-        INSTALL(TARGETS paho-mqtt3as-static
+        INSTALL(TARGETS paho-mqtt3cs-static paho-mqtt3as-static
+            RUNTIME DESTINATION bin
             ARCHIVE DESTINATION lib
             LIBRARY DESTINATION  ${PAHO_LIBRARY_DIR_NAME})
     ENDIF()