Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

cmake: fix situation like mingw where toolchain file sets platform defines

Browse source 
https://github.com/warmcat/libwebsockets/issues/1831
This commit is contained in:
Andy Green 2020-01-20 18:13:53 +00:00
parent 9116e5bd6e
commit 4683ae2596
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -13,6 +13,9 @@ endif()
set(LWS_ROLE_RAW 1)
set(LWS_WITH_POLL 1)
# it's at this point any toolchain file is brought in
project(libwebsockets C)
#
# Select features recommended for PC distro packaging
#
@ -170,12 +173,12 @@ if (LWS_PLAT_FREERTOS OR LWS_PLAT_OPTEE)
endif()
if (WIN32 OR LWS_PLAT_FREERTOS)
message(STATUS "No LWS_WITH_DIR and LWS_WITH_DIR")
message(STATUS "No LWS_WITH_DIR or LWS_WITH_LEJP_CONF")
set(LWS_WITH_DIR OFF)
set(LWS_WITH_LEJP_CONF OFF)
message("LWS_WITH_DIR ${LWS_WITH_DIR}")
else()
message(STATUS "Compiled with LWS_WITH_DIR and LWS_WITH_DIR")
message(STATUS "Compiled with LWS_WITH_DIR and LWS_WITH_LEJP_CONF")
set(LWS_WITH_DIR ON)
set(LWS_WITH_LEJP_CONF ON)
endif()
@ -271,8 +274,6 @@ if (LWS_PLAT_FREERTOS)
set(LWS_WITH_FTS 0)
endif()
project(libwebsockets C)
set(PACKAGE "libwebsockets")
set(CPACK_PACKAGE_NAME "${PACKAGE}")
set(CPACK_PACKAGE_VERSION_MAJOR "3")

2
lib/misc/dir.c
View file

@ -182,6 +182,6 @@ bail:
}
#else
#error "If you want lws_dir onw windows, you need libuv"
#error "If you want lws_dir on windows, you need libuv"
#endif
#endif