CMake build fixes for Windows.

eclipse · Dec 3, 2020 · 6ad5f19 · 6ad5f19
1 parent 2801d5c
commit 6ad5f19
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/apps/mosquitto_ctrl/CMakeLists.txt b/apps/mosquitto_ctrl/CMakeLists.txt
@@ -6,6 +6,8 @@ if (WITH_TLS AND CJSON_FOUND)
  ${OPENSSL_INCLUDE_DIR} ${STDBOOL_H_PATH} ${STDINT_H_PATH}
  ${CJSON_INCLUDE_DIRS} ${mosquitto_SOURCE_DIR}/apps/mosquitto_passwd)
 
+ link_directories(${CJSON_DIR})
+
  add_executable(mosquitto_ctrl
  mosquitto_ctrl.c mosquitto_ctrl.h
  client.c

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -12,7 +12,7 @@ set( CLIENT_DIR ${mosquitto_BINARY_DIR}/lib)
 
 if (CJSON_FOUND)
  add_definitions("-DWITH_CJSON")
- set( CLIENT_DIR "${CLIENT_DIR} ${CJSON_DIR}" )
+ set( CLIENT_DIR "${CLIENT_DIR};${CJSON_DIR}" )
  set( CLIENT_INC "${CLIENT_INC};${CJSON_INCLUDE_DIRS}" )
 endif()