Skip to content
Permalink
Browse files

DISPATCH-1268 - Assorted small tweaks

  • Loading branch information...
jdanekrh committed Feb 20, 2019
1 parent dbed4f4 commit 2fcc8f993217d33662e4b7680d8b11dbbbeb264d
Showing with 6 additions and 8 deletions.
  1. +3 −3 cmake/FindLibWebSockets.cmake
  2. +3 −5 src/CMakeLists.txt
@@ -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")
@@ -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})

0 comments on commit 2fcc8f9

Please sign in to comment.
You can’t perform that action at this time.