Skip to content

Commit

Permalink
Add more details on how to build Mosquitto.
Browse files Browse the repository at this point in the history
Explains more of the differences between the Makefiles and the CMake
scripts.
  • Loading branch information
ralight committed Jan 25, 2015
1 parent 96d98e6 commit 62456b3
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# This is a cmake script.
# This is a cmake script. Process it with the CMake gui or command line utility
# to produce makefiles / Visual Studio project files on Mac OS X and Windows.
#
# To configure the build options either use the CMake gui, or run the command
# line utility including the "-i" option.

set(CMAKE_LEGACY_CYGWIN_WIN32 0)

Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ docs :
binary : mosquitto

mosquitto :
ifeq ($(UNAME),Darwin)
$(error Please compile using CMake on Mac OS X)
endif

set -e; for d in ${DIRS}; do $(MAKE) -C $${d}; done

clean :
Expand Down
4 changes: 4 additions & 0 deletions config.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# =============================================================================
# User configuration section.
#
# These options control compilation on all systems apart from Windows and Mac
# OS X. Use CMake to compile on Windows and Mac.
#
# Largely, these are options that are designed to make mosquitto run more
# easily in restrictive environments by removing features.
#
Expand Down Expand Up @@ -94,6 +97,7 @@ DB_HTML_XSL=man/html.xsl
#MANCOUNTRIES=en_GB

UNAME:=$(shell uname -s)

ifeq ($(UNAME),SunOS)
ifeq ($(CC),cc)
CFLAGS?=-O
Expand Down

0 comments on commit 62456b3

Please sign in to comment.