From 47671fe50433a344609d845e5876bfda168a81ba Mon Sep 17 00:00:00 2001 From: Fabrice GILOT Date: Fri, 16 Sep 2016 09:03:22 +0800 Subject: [PATCH] CMakeLists: move config file generation to after LWS_HAVE_OPENSSL_ECDH_H This is already fixed in v2.0 and master --- CMakeLists.txt | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 972c005..83defae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -397,16 +397,6 @@ if (NOT LWS_HAVE_REALLOC) set(realloc rpl_realloc) endif() -# Generate the lws_config.h that includes all the public compilation settings. -configure_file( - "${PROJECT_SOURCE_DIR}/lws_config.h.in" - "${PROJECT_BINARY_DIR}/lws_config.h") - -# Generate the lws_config.h that includes all the private compilation settings. -configure_file( - "${PROJECT_SOURCE_DIR}/lws_config_private.h.in" - "${PROJECT_BINARY_DIR}/lws_config_private.h") - if (MSVC) # Turn off stupid microsoft security warnings. add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) @@ -734,6 +724,18 @@ if (LWS_WITH_LIBUV) list(APPEND LIB_LIST ${LIBUV_LIBRARIES}) endif() + +# Generate the lws_config.h that includes all the public compilation settings. +configure_file( + "${PROJECT_SOURCE_DIR}/lws_config.h.in" + "${PROJECT_BINARY_DIR}/lws_config.h") + +# Generate the lws_config.h that includes all the private compilation settings. +configure_file( + "${PROJECT_SOURCE_DIR}/lws_config_private.h.in" + "${PROJECT_BINARY_DIR}/lws_config_private.h") + + # # Platform specific libs. # -- 2.7.4