From 31435c9f7091f0fb97582ae8b28250944e284285 Mon Sep 17 00:00:00 2001 From: Rogonov Stepan Date: Thu, 24 Dec 2020 16:18:46 +0300 Subject: [PATCH] cmake: move LWS__INCLUDE_DIRS def to after REL_INCLIDE_DIR def Generate the config file for the installation tree fix wrong LWS__INCLUDE_DIRS definition --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b1260be0..68d2f11f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -865,14 +865,6 @@ if(WIN32 AND NOT CYGWIN) else() set(DEF_INSTALL_CMAKE_DIR lib${LIB_SUFFIX}/cmake/libwebsockets) endif() - -if (DEFINED REL_INCLUDE_DIR) - set(LWS__INCLUDE_DIRS "\${LWS_CMAKE_DIR}/${REL_INCLUDE_DIR}") -endif() - -configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config.cmake.in - ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/libwebsockets-config.cmake - @ONLY) configure_file(${PROJECT_SOURCE_DIR}/cmake/LwsCheckRequirements.cmake ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/LwsCheckRequirements.cmake @@ -977,6 +969,14 @@ file(RELATIVE_PATH "${LWS_ABSOLUTE_INSTALL_CMAKE_DIR}" "${LWS_ABSOLUTE_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from the cmake dir. +if (DEFINED REL_INCLUDE_DIR) + set(LWS__INCLUDE_DIRS "\${LWS_CMAKE_DIR}/${REL_INCLUDE_DIR}") +endif() + +configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config.cmake.in + ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/libwebsockets-config.cmake + @ONLY) + set_target_properties(${LWS_LIBRARIES} PROPERTIES PUBLIC_HEADER "${HDR_PUBLIC}")