Commit Graph

101 Commits (49ebb585693aa3361b9ec235c1a2d28407a2091d)

Author SHA1 Message Date
Pierre Hallot 8504f6b70b
CMake: Use PROJECT_SOURCE_DIR to improve using mosquitto as subdirectory
When mosquitto is included as subdirectory, `CMAKE_SOURCE_DIR` does not refer to the mosquitto top level CMake file, but to the whole project top level CMake.
Use `PROJECT_SOURCE_DIR` instead to refer to the right CMake in both contextes.

Signed-off-by: Pierre Hallot <hallotpierre@gmail.com>
4 years ago
Roger A. Light 74814cc68f Simplify cmake threads detection on Windows
Requires cmake 3.1.
4 years ago
Roger A. Light 49b1d7dfbd Merge branch 'win-threads' of https://github.com/podsvirov/mosquitto into podsvirov-win-threads 4 years ago
Roger A. Light 2a056f14c2 Bump version number, update web. 4 years ago
Konstantin Podsvirov f5fd5cd210 Fix hardcoded pthreads paths on Windows
Use FindThreads module instead if available.

Signed-off-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
4 years ago
Roger A. Light 292e969140 Bump version, update web. 4 years ago
Roger A. Light 42acfdad41 Bump version, update web page. 4 years ago
Roger A. Light ea7e2a6bca Bump version, add post. 4 years ago
Roger A. Light e7aa0fed2f Bump version, update web page. 5 years ago
Roger A. Light bb73eed557 Bump version number and update web pages. 5 years ago
Roger A. Light cec9d36445 Bump version and web pages. 5 years ago
Roger A. Light c2a26250f6 Bump changelog, versions, and web pages. 5 years ago
Roger A. Light bbe0afbfbe Add missing WITH_CJSON option. 5 years ago
Roger A. Light 53b7cc5fc1 Bump version number, add web post. 5 years ago
Boris Feinstein c16514ca23 perform cjson discovery only if WITH_CJSON=ON
When using cmake to build the project, cJson discovery
should only be performed if WITH_CJSON=ON.

Closes #2026.

Signed-off-by: Boris Feinstein <madhat1@gmail.com>
5 years ago
Roger A. Light ae3800ad66 Bump version number, add www post. 5 years ago
Roger A. Light 5a565da82b Bump version number. Update changelog and web pages. 5 years ago
Roger A. Light d02bc03ed8 Bump version, changelog and webpage. 5 years ago
Pierre Hallot 57d2818a3d
Fix appending CMake module path to existing path
The code would simply append the folder with no separator, resulting in an invalid path if the variable was not empty.
Now properly append it.

Signed-off-by: Pierre Hallot <hallotpierre@gmail.com>
5 years ago
Pierre Hallot ddb0f21ab5
Set cmake_minimum_required first as recommended in the documentation
https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html
"Note Call the cmake_minimum_required() command at the beginning of the top-level CMakeLists.txt file even before calling the project() command. It is important to establish version and policy settings before invoking other commands whose behavior they may affect."

Signed-off-by: Pierre Hallot <hallotpierre@gmail.com>
5 years ago
Pierre Hallot 4dcfe5424f
Remove CMAKE_LEGACY_CYGWIN_WIN32 which is not needed anymore
According to this from the mailing list, it is no longer required since the minimum cmake required is 3.0.

https://cmake.org/pipermail/cmake/2014-July/058048.html
"The code that emits the warning is run by "project()". Since you do not have an explicit project() call in your top-level CMakeLists.txt CMake adds one to the top implicitly. [1]
A project file that explicitly calls project() after requiring CMake >= 2.8.4 should make the warning go away."

Signed-off-by: Pierre Hallot <hallotpierre@gmail.com>
5 years ago
Roger A. Light cc47eaba09 Bump version number and update webpage. 5 years ago
Roger A. Light 66b680af34 Bump version number. 5 years ago
Roger A. Light 6904fac6a4 Bump version number and changelog. 5 years ago
Roger A. Light 2687d18214 macOS build fixes. 5 years ago
Roger A. Light 550c54701e Fix cmake build when cjson not available. 5 years ago
Pierre Hallot 2afc5783a9 CMake: Move cJSON check out of the plugin check since it is required elsewhere
Some client/app code also optionally use cJSON, however it won't be found if plugins are disabled.

Signed-off-by: Pierre Hallot <hallotpierre@gmail.com>
5 years ago
Pierre Hallot 3ac8daa8aa CMake: add options about whether to build the apps and plugins
Useful in case only the lib is needed.

Signed-off-by: Pierre Hallot <hallotpierre@gmail.com>
5 years ago
Arenoros 9c3a214a01 In android ndk doesn't exist librt and libpthread
Signed-off-by: Arenoros <arenoros@gmail.com>
5 years ago
Roger A. Light fdff255916 New dynamic security plugin. 5 years ago
Roger A. Light 89733138bb CMake build fixes. 5 years ago
Roger A. Light c90e49af1b Merge remote-tracking branch 'origin/fixes' into develop 5 years ago
Roger A. Light 39ff7226eb Bump version, add new www posts. 5 years ago
Roger A. Light c9218fd48c Bump version. 5 years ago
Roger A. Light cea0423e69 Update changelog and version. 5 years ago
Roger A. Light f0deb9a5a1 CMake: Make building clients, broker and C++ library optional.
Issue #1641.
6 years ago
Roger A. Light 4ab0f4bd39 Fix bundled deps option not being propagated to library.
Issue #1641.
6 years ago
Roger A. Light d96543c0b8 Merge branch 'fixes' into develop 6 years ago
Roger A. Light b544b46156 Update version. 6 years ago
Roger A. Light c0443637e8 Merge branch 'master'
Conflicts:
	ChangeLog.txt
	config.mk
	src/context.c
	src/loop.c
	src/subs.c
	test/broker/01-connect-bad-packet.py
	test/broker/02-subpub-qos1-bad-pubcomp.py
	test/broker/02-subpub-qos1-bad-pubrec.py
	test/broker/02-subpub-qos2-bad-puback-1.py
	test/broker/02-subpub-qos2-bad-puback-2.py
	test/broker/02-subpub-qos2-bad-pubcomp.py
	test/broker/02-subpub-qos2.py
	test/broker/07-will-null-topic.py
6 years ago
Roger A. Light b410568299 Bump version, add release post. 6 years ago
Roger Light c052950639
Merge pull request #1328 from tgurr/cmake-pkgconfig
Install pkg-config files into arch dependent locations also for CMake builds
6 years ago
Roger A. Light ad5c2e11d9 Use cJSON for producing JSON output in clients.
Closes #1222. Thanks to Ben Barbour.
6 years ago
Roger A. Light 499e2f2e98 Add support for unix sockets to broker, lib, and clients. 6 years ago
Roger A. Light b7d8eb1122 Bump version number. Update www. 6 years ago
Roger A. Light 9883652dde Bump version, update www and changelog. 6 years ago
Roger A. Light 6e2be25881 Bump version numbers, add release info. 6 years ago
Roger A. Light a0e7165a9c Fix WITH_STATIC_LIBRARIES using CMake on Windows
Closes #1369. Thanks to TimmvonderMehden
6 years ago
Roger A. Light ce3e33e890 Bump version number, add release post. 6 years ago
Timo Gurr 99ace10daf Install pkg-config files into arch dependent locations also for CMake builds
libmosquitto.pc and libmosquittopp.pc contain arch dependent information.
The Makefile based build already does this correctly.

Signed-off-by: Timo Gurr <timo.gurr@gmail.com>
6 years ago