natas_hw
/
paho
mirror of https://github.com/eclipse/paho.mqtt.c
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumped CMake minimum to 3.5 and added a project version

This commit is contained in:
fpagliughi 2023-11-27 13:22:29 -05:00
parent ac5ce59ab4
commit 59761f5b00
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CMakeLists.txt
View File

@ -17,20 +17,30 @@
# Note: on OS X you should install XCode and the associated command-line tools # Note: on OS X you should install XCode and the associated command-line tools
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12) CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
PROJECT("Eclipse Paho C" C) PROJECT("Eclipse Paho C"
VERSION 1.3.13
LANGUAGES C
)
MESSAGE(STATUS "CMake version: " ${CMAKE_VERSION}) MESSAGE(STATUS "CMake version: " ${CMAKE_VERSION})
MESSAGE(STATUS "CMake system name: " ${CMAKE_SYSTEM_NAME}) MESSAGE(STATUS "CMake system name: " ${CMAKE_SYSTEM_NAME})
SET(CMAKE_SCRIPTS "${CMAKE_SOURCE_DIR}/cmake") SET(CMAKE_SCRIPTS "${CMAKE_SOURCE_DIR}/cmake")
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
## build settings ## Project Version
## Previously we read in the version from these files, but now we use the
## CMake project setting. We just make sure the files and CMake match.
file(READ version.major PAHO_VERSION_MAJOR) file(READ version.major PAHO_VERSION_MAJOR)
file(READ version.minor PAHO_VERSION_MINOR) file(READ version.minor PAHO_VERSION_MINOR)
file(READ version.patch PAHO_VERSION_PATCH) file(READ version.patch PAHO_VERSION_PATCH)
SET(CLIENT_VERSION ${PAHO_VERSION_MAJOR}.${PAHO_VERSION_MINOR}.${PAHO_VERSION_PATCH}) SET(CLIENT_VERSION ${PAHO_VERSION_MAJOR}.${PAHO_VERSION_MINOR}.${PAHO_VERSION_PATCH})
if(NOT (CLIENT_VERSION VERSION_EQUAL PROJECT_VERSION))
message(FATAL_ERROR "CMake project version does NOT match. CMake: ${PROJECT_VERSION}, Files: ${CLIENT_VERSION}")
endif()
INCLUDE(GNUInstallDirs) INCLUDE(GNUInstallDirs)
STRING(TIMESTAMP BUILD_TIMESTAMP UTC) STRING(TIMESTAMP BUILD_TIMESTAMP UTC)
@ -116,9 +126,9 @@ ELSE()
INSTALL(FILES ${samples} DESTINATION ${CMAKE_INSTALL_DOCDIR}) INSTALL(FILES ${samples} DESTINATION ${CMAKE_INSTALL_DOCDIR})
ENDIF() ENDIF()
SET(CPACK_PACKAGE_VERSION_MAJOR ${PAHO_VERSION_MAJOR}) SET(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
SET(CPACK_PACKAGE_VERSION_MINOR ${PAHO_VERSION_MINOR}) SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
SET(CPACK_PACKAGE_VERSION_PATCH ${PAHO_VERSION_PATCH}) SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
INCLUDE(CPack) INCLUDE(CPack)
IF(PAHO_ENABLE_TESTING) IF(PAHO_ENABLE_TESTING)

16
src/CMakeLists.txt
View File

@ -110,8 +110,8 @@ IF (PAHO_BUILD_SHARED)
SET_TARGET_PROPERTIES( SET_TARGET_PROPERTIES(
paho-mqtt3c paho-mqtt3a PROPERTIES paho-mqtt3c paho-mqtt3a PROPERTIES
VERSION ${CLIENT_VERSION} VERSION ${PROJECT_VERSION}
SOVERSION ${PAHO_VERSION_MAJOR} SOVERSION ${PROJECT_VERSION_MAJOR}
COMPILE_DEFINITIONS "PAHO_MQTT_EXPORTS=1") COMPILE_DEFINITIONS "PAHO_MQTT_EXPORTS=1")
IF(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") IF(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
@ -161,8 +161,8 @@ IF (PAHO_BUILD_STATIC)
ENDIF() ENDIF()
SET_TARGET_PROPERTIES( SET_TARGET_PROPERTIES(
paho-mqtt3c-static paho-mqtt3a-static PROPERTIES paho-mqtt3c-static paho-mqtt3a-static PROPERTIES
VERSION ${CLIENT_VERSION} VERSION ${PROJECT_VERSION}
SOVERSION ${PAHO_VERSION_MAJOR} SOVERSION ${PROJECT_VERSION_MAJOR}
COMPILE_DEFINITIONS "PAHO_MQTT_STATIC=1") COMPILE_DEFINITIONS "PAHO_MQTT_STATIC=1")
FOREACH(TARGET paho-mqtt3c-static paho-mqtt3a-static) FOREACH(TARGET paho-mqtt3c-static paho-mqtt3a-static)
@ -206,8 +206,8 @@ IF (PAHO_WITH_SSL)
SET_TARGET_PROPERTIES( SET_TARGET_PROPERTIES(
paho-mqtt3cs paho-mqtt3as PROPERTIES paho-mqtt3cs paho-mqtt3as PROPERTIES
VERSION ${CLIENT_VERSION} VERSION ${PROJECT_VERSION}
SOVERSION ${PAHO_VERSION_MAJOR} SOVERSION ${PROJECT_VERSION_MAJOR}
COMPILE_DEFINITIONS "OPENSSL=1;PAHO_MQTT_EXPORTS=1") COMPILE_DEFINITIONS "OPENSSL=1;PAHO_MQTT_EXPORTS=1")
IF(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") IF(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
@ -258,8 +258,8 @@ IF (PAHO_WITH_SSL)
SET_TARGET_PROPERTIES( SET_TARGET_PROPERTIES(
paho-mqtt3cs-static paho-mqtt3as-static PROPERTIES paho-mqtt3cs-static paho-mqtt3as-static PROPERTIES
VERSION ${CLIENT_VERSION} VERSION ${PROJECT_VERSION}
SOVERSION ${PAHO_VERSION_MAJOR} SOVERSION ${PROJECT_VERSION_MAJOR}
COMPILE_DEFINITIONS "OPENSSL=1;PAHO_MQTT_STATIC=1") COMPILE_DEFINITIONS "OPENSSL=1;PAHO_MQTT_STATIC=1")
IF (NOT WIN32) IF (NOT WIN32)
SET_TARGET_PROPERTIES(paho-mqtt3cs-static PROPERTIES OUTPUT_NAME paho-mqtt3cs) SET_TARGET_PROPERTIES(paho-mqtt3cs-static PROPERTIES OUTPUT_NAME paho-mqtt3cs)