Merge branch 'master' of github.com:eclipse/paho.mqtt.c

CMakeLists.txt

@@ -49,6 +49,8 @@ SET(PAHO_BUILD_DOCUMENTATION FALSE CACHE BOOL "Create and install the HTML based
 SET(PAHO_BUILD_SAMPLES FALSE CACHE BOOL "Build sample programs")
 SET(PAHO_BUILD_DEB_PACKAGE FALSE CACHE BOOL "Build debian package")
 SET(PAHO_ENABLE_TESTING TRUE CACHE BOOL "Build tests and run")
+SET(PAHO_ENABLE_CPACK TRUE CACHE BOOL "Enable CPack")
+
 
 ADD_SUBDIRECTORY(src)
 IF(PAHO_BUILD_SAMPLES)
@@ -59,22 +61,32 @@ IF(PAHO_BUILD_DOCUMENTATION)
     ADD_SUBDIRECTORY(doc)
 ENDIF()
 
-### packaging settings
-SET(CPACK_PACKAGE_VENDOR "Eclipse Paho")
-SET(CPACK_PACKAGE_NAME "Eclipse-Paho-MQTT-C")
-INSTALL(FILES CONTRIBUTING.md epl-v10 edl-v10 README.md notice.html DESTINATION .)
-FILE(GLOB samples "src/samples/*.c")
-INSTALL(FILES ${samples} DESTINATION samples)
-IF (WIN32)
-    SET(CPACK_GENERATOR "ZIP")
-ELSEIF(PAHO_BUILD_DEB_PACKAGE)
-    SET(CPACK_GENERATOR "DEB")
-    CONFIGURE_FILE(${CMAKE_SCRIPTS}/CPackDebConfig.cmake.in
-        ${CMAKE_BINARY_DIR}/CPackDebConfig.cmake @ONLY)
-    SET(CPACK_PROJECT_CONFIG_FILE ${CMAKE_BINARY_DIR}/CPackDebConfig.cmake)
-    ADD_SUBDIRECTORY(debian)
+IF (PAHO_ENABLE_CPACK)
+       ### packaging settings
+       FILE(GLOB samples "src/samples/*.c")
+       INSTALL(FILES ${samples} DESTINATION samples)
+
+       SET(CPACK_PACKAGE_VENDOR "Eclipse Paho")
+       SET(CPACK_PACKAGE_NAME "Eclipse-Paho-MQTT-C")
+       INSTALL(FILES CONTRIBUTING.md epl-v10 edl-v10 README.md notice.html DESTINATION .)
+
+       IF (WIN32)
+               SET(CPACK_GENERATOR "ZIP")
+       ELSEIF(PAHO_BUILD_DEB_PACKAGE)
+               INSTALL(FILES CONTRIBUTING.md epl-v10 edl-v10 README.md notice.html DESTINATION .)
+
+               SET(CPACK_GENERATOR "DEB")
+               CONFIGURE_FILE(${CMAKE_SCRIPTS}/CPackDebConfig.cmake.in
+                       ${CMAKE_BINARY_DIR}/CPackDebConfig.cmake @ONLY)
+               SET(CPACK_PROJECT_CONFIG_FILE ${CMAKE_BINARY_DIR}/CPackDebConfig.cmake)
+               ADD_SUBDIRECTORY(debian)
+       ELSE()
+               SET(CPACK_GENERATOR "TGZ")
+       ENDIF()
 ELSE()
-    SET(CPACK_GENERATOR "TGZ")
+       FILE(GLOB samples "src/samples/*.c")
+       INSTALL(FILES ${samples} DESTINATION ${CMAKE_INSTALL_DOCDIR})
+
 ENDIF()
 
 SET(CPACK_PACKAGE_VERSION_MAJOR ${PAHO_VERSION_MAJOR})

doc/CMakeLists.txt

@@ -36,5 +36,10 @@ FOREACH(DOXYFILE_SRC DoxyfileV3ClientAPI;DoxyfileV3AsyncAPI;DoxyfileV3ClientInte
     )
     SET(DOXYTARGETS ${DOXYTARGETS} ${DOXYFILE_SRC}.target)
 ENDFOREACH(DOXYFILE_SRC)
+
 ADD_CUSTOM_TARGET(doc ALL DEPENDS ${DOXYTARGETS})
-INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION share)
+IF (PAHO_ENABLE_CPACK)
+    INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION share)
+ELSE()
+    INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ENDIF()
\ No newline at end of file