Skip to content

Commit

Permalink
modern cmake, set needed target macro define (#329)
Browse files Browse the repository at this point in the history
* add "LWS_WITH_LIBUV" define  into websockets cmake files

* add _GNU_SOURCE into luasockets target
  • Loading branch information
drelaptop authored and minggo committed Nov 6, 2018
1 parent 445a001 commit 222e67f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions lua/luasocket/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ add_library(${target_name} STATIC
${${target_name}_src}
)

if(LINUX)
target_compile_definitions(${target_name} PRIVATE _GNU_SOURCE)
endif()

target_include_directories(${target_name}
INTERFACE ..
PRIVATE ../lua
Expand Down
8 changes: 4 additions & 4 deletions websockets/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ include(../cmake/CocosExternalConfig.cmake)

add_library(${target_name} STATIC IMPORTED GLOBAL)

# include libs depended
# add_subdirectory(../openssl ${CMAKE_BINARY_DIR}/websockets/openssl)
# add_subdirectory(../uv ${CMAKE_BINARY_DIR}/websockets/uv)

set_target_properties(${target_name} PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include/${platform_name}"
)
set_target_properties(${target_name} PROPERTIES
INTERFACE_COMPILE_DEFINITIONS "LWS_WITH_LIBUV"
)

set_property(TARGET ${target_name} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "ext_ssl")
set_property(TARGET ${target_name} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "ext_crypto")
set_property(TARGET ${target_name} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "ext_uv")
Expand Down

0 comments on commit 222e67f

Please sign in to comment.