Permalink
Browse files

Fix string quoting in CMakeLists.txt. Closes #4.

  • Loading branch information...
1 parent 35c4d3d commit 69a08ab90520f4d1fc93aa11165ac829bebed8fa @ralight ralight committed Mar 13, 2016
Showing with 22 additions and 18 deletions.
  1. +6 −6 CMakeLists.txt
  2. +4 −0 ChangeLog.txt
  3. +4 −4 client/CMakeLists.txt
  4. +2 −2 lib/CMakeLists.txt
  5. +2 −2 lib/cpp/CMakeLists.txt
  6. +4 −4 src/CMakeLists.txt
View
@@ -37,18 +37,18 @@ if (WIN32)
else (WIN32)
set (BINDIR bin)
set (SBINDIR sbin)
- if (${CMAKE_INSTALL_PREFIX} STREQUAL /usr)
+ if ("${CMAKE_INSTALL_PREFIX}" STREQUAL /usr)
set (SYSCONFDIR /etc/mosquitto)
- else (${CMAKE_INSTALL_PREFIX} STREQUAL /usr)
+ else ("${CMAKE_INSTALL_PREFIX}" STREQUAL /usr)
set (SYSCONFDIR etc/mosquitto)
- endif (${CMAKE_INSTALL_PREFIX} STREQUAL /usr)
+ endif ("${CMAKE_INSTALL_PREFIX}" STREQUAL /usr)
set (LIBDIR lib${LIB_SUFFIX})
set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}")
set (INCLUDEDIR include)
set (DATAROOTDIR share)
- set (MANDIR ${DATAROOTDIR}/man)
- set (SHAREDIR ${DATAROOTDIR}/mosquitto)
+ set (MANDIR "${DATAROOTDIR}/man")
+ set (SHAREDIR "${DATAROOTDIR}/mosquitto")
endif (WIN32)
option(WITH_TLS
@@ -92,4 +92,4 @@ add_subdirectory(man)
# Install config file
# ========================================
-install(FILES mosquitto.conf aclfile.example pskfile.example pwfile.example DESTINATION ${SYSCONFDIR})
+install(FILES mosquitto.conf aclfile.example pskfile.example pwfile.example DESTINATION "${SYSCONFDIR}")
View
@@ -18,6 +18,10 @@ Client library:
Clients:
- Handle some unchecked malloc() calls. Closes #1.
+Build:
+- Fix string quoting in CMakeLists.txt. Closes #4.
+
+
1.4.8 - 20160214
================
@@ -8,11 +8,11 @@ if (${WITH_SRV} STREQUAL ON)
add_definitions("-DWITH_SRV")
endif (${WITH_SRV} STREQUAL ON)
-add_executable(mosquitto_pub pub_client.c ${shared_src})
-add_executable(mosquitto_sub sub_client.c ${shared_src})
+add_executable(mosquitto_pub pub_client.c "${shared_src}")
+add_executable(mosquitto_sub sub_client.c "${shared_src}")
target_link_libraries(mosquitto_pub libmosquitto)
target_link_libraries(mosquitto_sub libmosquitto)
-install(TARGETS mosquitto_pub RUNTIME DESTINATION ${BINDIR} LIBRARY DESTINATION ${LIBDIR})
-install(TARGETS mosquitto_sub RUNTIME DESTINATION ${BINDIR} LIBRARY DESTINATION ${LIBDIR})
+install(TARGETS mosquitto_pub RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
+install(TARGETS mosquitto_sub RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
View
@@ -70,8 +70,8 @@ set_target_properties(libmosquitto PROPERTIES
SOVERSION 1
)
-install(TARGETS libmosquitto RUNTIME DESTINATION ${BINDIR} LIBRARY DESTINATION ${LIBDIR})
-install(FILES mosquitto.h DESTINATION ${INCLUDEDIR})
+install(TARGETS libmosquitto RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
+install(FILES mosquitto.h DESTINATION "${INCLUDEDIR}")
if (UNIX)
install(CODE "EXEC_PROGRAM(/sbin/ldconfig)")
@@ -10,8 +10,8 @@ set_target_properties(mosquittopp PROPERTIES
VERSION ${VERSION}
SOVERSION 1
)
-install(TARGETS mosquittopp RUNTIME DESTINATION ${BINDIR} LIBRARY DESTINATION ${LIBDIR})
-install(FILES mosquittopp.h DESTINATION ${INCLUDEDIR})
+install(TARGETS mosquittopp RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
+install(FILES mosquittopp.h DESTINATION "${INCLUDEDIR}")
if (UNIX)
install(CODE "EXEC_PROGRAM(/sbin/ldconfig)")
View
@@ -117,13 +117,13 @@ if (UNIX)
endif (APPLE)
endif (UNIX)
-install(TARGETS mosquitto RUNTIME DESTINATION ${SBINDIR} LIBRARY DESTINATION ${LIBDIR})
-install(FILES mosquitto_plugin.h DESTINATION ${INCLUDEDIR})
+install(TARGETS mosquitto RUNTIME DESTINATION "${SBINDIR}" LIBRARY DESTINATION "${LIBDIR}")
+install(FILES mosquitto_plugin.h DESTINATION "${INCLUDEDIR}")
if (${WITH_TLS} STREQUAL ON)
add_executable(mosquitto_passwd mosquitto_passwd.c)
- target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES})
- install(TARGETS mosquitto_passwd RUNTIME DESTINATION ${BINDIR} LIBRARY DESTINATION ${LIBDIR})
+ target_link_libraries(mosquitto_passwd "${OPENSSL_LIBRARIES}")
+ install(TARGETS mosquitto_passwd RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
endif (${WITH_TLS} STREQUAL ON)
if (UNIX)

0 comments on commit 69a08ab

Please sign in to comment.