DISPATCH-1268 - Assorted small tweaks

apache · Mar 5, 2019 · 39c7fb3 · 39c7fb3
1 parent 8a47be0
commit 39c7fb3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/cmake/FindLibWebSockets.cmake b/cmake/FindLibWebSockets.cmake
@@ -34,13 +34,13 @@
 
 find_library(LIBWEBSOCKETS_LIBRARIES
   NAMES websockets libwebsockets
-  HINTS ${LIBWEBSOCKETS_LIBRARYDIR} ${LIBWEBSOCKETS_ROOT}  ${CMAKE_INSTALL_PREFIX}
+  HINTS "${LIBWEBSOCKETS_LIBRARYDIR}" "${LIBWEBSOCKETS_ROOT}" "${CMAKE_INSTALL_PREFIX}"
   )
 
 find_path(LIBWEBSOCKETS_INCLUDE_DIRS
   NAMES libwebsockets.h
-  HINTS ${LIBWEBSOCKETS_INCLUDEDIR} ${LIBWEBSOCKETS_ROOT}/include ${CMAKE_INSTALL_PREFIX}/include
-  PATHS /usr/include
+  HINTS "${LIBWEBSOCKETS_INCLUDEDIR}" "${LIBWEBSOCKETS_ROOT}/include" "${CMAKE_INSTALL_PREFIX}/include"
+  PATHS "/usr/include"
   )
 
 if(LIBWEBSOCKETS_INCLUDE_DIRS AND EXISTS "${LIBWEBSOCKETS_INCLUDE_DIRS}/lws_config.h")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -134,20 +134,18 @@ if(USE_MEMORY_POOL)
   list(APPEND qpid_dispatch_SOURCES alloc_pool.c)
 endif()
 
-# strict aliasing optimization is only available in GCC
+# DISPATCH-654 There are, in fact, no strict-aliasing violations and newer compilers don't complain.
 if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set_property(
       SOURCE python_embedded.c router_pynode.c
-      PROPERTY COMPILE_FLAGS -Wno-strict-aliasing
-    )
+      PROPERTY COMPILE_FLAGS -Wno-strict-aliasing)
 endif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
 
 add_library(qpid-dispatch SHARED ${qpid_dispatch_SOURCES})
 target_include_directories(qpid-dispatch PRIVATE ${qpid_dispatch_INCLUDES})
 target_link_libraries(qpid-dispatch ${qpid_dispatch_LIBRARIES})
 set_target_properties(qpid-dispatch PROPERTIES
-  LINK_FLAGS "${CATCH_UNDEFINED}"
-  )
+  LINK_FLAGS "${CATCH_UNDEFINED}")
 install(TARGETS qpid-dispatch
   LIBRARY DESTINATION ${QPID_DISPATCH_HOME})