diff --git a/CMakeLists.txt b/CMakeLists.txt index 2740c5a8..6baaf914 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -308,7 +308,7 @@ if (WIN32 AND NOT USE_EXTERNAL_ZLIB) # Set the same variables as find_package would. set(ZLIB_INCLUDE_DIRS ${WIN32_ZLIB_PATH}) - get_property(ZLIB_LIBRARIES TARGET zlib PROPERTY LOCATION) + get_property(ZLIB_LIBRARIES TARGET ZLIB PROPERTY LOCATION) set(ZLIB_FOUND 1) else() find_package(ZLIB REQUIRED) diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h index d78bc0a0..d67e6a0d 100644 --- a/lib/private-libwebsockets.h +++ b/lib/private-libwebsockets.h @@ -18,11 +18,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301 USA */ + +// System introspection configs. #ifdef CMAKE_BUILD #include "lws_config.h" #else +#ifdef WIN32 +#define inline __inline +#else #include "config.h" #endif +#endif #if _MSC_VER > 1000 || defined(_WIN32) #else