d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix building on OS X.

Browse Source
This commit is contained in:
Roger A. Light 2015-02-17 23:21:14 +00:00
parent ff9c2087b1
commit ff3ebd969b
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -8,7 +8,8 @@ set(CMAKE_LEGACY_CYGWIN_WIN32 0)
project(mosquitto) project(mosquitto)
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.8)
cmake_policy(SET CMP0042 NEW)
set (VERSION 1.4) set (VERSION 1.4)
@ -30,8 +31,8 @@ if (WIN32)
set (INCLUDEDIR include) set (INCLUDEDIR include)
set (DATAROOTDIR share) set (DATAROOTDIR share)
set (MANDIR man) set (MANDIR man)
set (SHAREDEST .) set (SHAREDEST .)
add_definitions("-D_CRT_SECURE_NO_WARNINGS") add_definitions("-D_CRT_SECURE_NO_WARNINGS")
add_definitions("-D_CRT_NONSTDC_NO_DEPRECATE") add_definitions("-D_CRT_NONSTDC_NO_DEPRECATE")
else (WIN32) else (WIN32)
set (BINDIR bin) set (BINDIR bin)
@ -43,6 +44,7 @@ else (WIN32)
endif (${CMAKE_INSTALL_PREFIX} STREQUAL /usr) endif (${CMAKE_INSTALL_PREFIX} STREQUAL /usr)
set (LIBDIR lib${LIB_SUFFIX}) set (LIBDIR lib${LIB_SUFFIX})
set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}")
set (INCLUDEDIR include) set (INCLUDEDIR include)
set (DATAROOTDIR share) set (DATAROOTDIR share)
set (MANDIR ${DATAROOTDIR}/man) set (MANDIR ${DATAROOTDIR}/man)

31
src/CMakeLists.txt
View File

@ -2,16 +2,6 @@ include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/src
${mosquitto_SOURCE_DIR}/lib ${OPENSSL_INCLUDE_DIR} ${mosquitto_SOURCE_DIR}/lib ${OPENSSL_INCLUDE_DIR}
${STDBOOL_H_PATH} ${STDINT_H_PATH}) ${STDBOOL_H_PATH} ${STDINT_H_PATH})
if (UNIX)
if (APPLE)
# FIXME - something else needs fixing before this will work.
#set (CMAKE_EXE_LINKER_FLAGS "-Wl,-exported_symbols_list -Wl,${mosquitto_SOURCE_DIR}/src/linker-macosx.syms")
else (APPLE)
set (CMAKE_EXE_LINKER_FLAGS "-Wl,--dynamic-list=${mosquitto_SOURCE_DIR}/src/linker.syms")
set (CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
endif (APPLE)
endif (UNIX)
set (MOSQ_SRCS set (MOSQ_SRCS
conf.c conf.c
context.c context.c
@ -109,18 +99,27 @@ if (${WITH_WEBSOCKETS} STREQUAL ON)
endif (${WITH_WEBSOCKETS} STREQUAL ON) endif (${WITH_WEBSOCKETS} STREQUAL ON)
# Simple detect libuuid # Simple detect libuuid
FIND_PATH(UUID_HEADER uuid/uuid.h) if(NOT APPLE)
if (UUID_HEADER) FIND_PATH(UUID_HEADER uuid/uuid.h)
add_definitions(-DWITH_UUID) if (UUID_HEADER)
set (MOSQ_LIBS ${MOSQ_LIBS} uuid) add_definitions(-DWITH_UUID)
endif (UUID_HEADER) set (MOSQ_LIBS ${MOSQ_LIBS} uuid)
endif (UUID_HEADER)
endif(NOT APPLE)
target_link_libraries(mosquitto ${MOSQ_LIBS}) target_link_libraries(mosquitto ${MOSQ_LIBS})
if (UNIX)
if (APPLE)
set_target_properties(mosquitto PROPERTIES LINK_FLAGS "-Wl,-exported_symbols_list -Wl,${mosquitto_SOURCE_DIR}/src/linker-macosx.syms")
else (APPLE)
set_target_properties(mosquitto PROPERTIES LINK_FLAGS "-Wl,-exported_symbols_list -Wl,${mosquitto_SOURCE_DIR}/src/linker.syms")
endif (APPLE)
endif (UNIX)
install(TARGETS mosquitto RUNTIME DESTINATION ${SBINDIR} LIBRARY DESTINATION ${LIBDIR}) install(TARGETS mosquitto RUNTIME DESTINATION ${SBINDIR} LIBRARY DESTINATION ${LIBDIR})
install(FILES mosquitto_plugin.h DESTINATION ${INCLUDEDIR}) install(FILES mosquitto_plugin.h DESTINATION ${INCLUDEDIR})
if (${WITH_TLS} STREQUAL ON) if (${WITH_TLS} STREQUAL ON)
add_executable(mosquitto_passwd mosquitto_passwd.c) add_executable(mosquitto_passwd mosquitto_passwd.c)
target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES}) target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES})

2
src/linker-macosx.syms
View File

@ -1 +1 @@
mosquitto_log_printf _mosquitto_log_printf