mirror of
https://github.com/warmcat/libwebsockets.git
synced 2025-03-16 00:00:07 +01:00
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
This commit is contained in:
parent
736f0739ed
commit
2775f9275e
2 changed files with 14 additions and 6 deletions
6
.gitignore
vendored
6
.gitignore
vendored
|
@ -62,3 +62,9 @@ doc
|
|||
/q/
|
||||
/b1/
|
||||
/destdir/
|
||||
|
||||
/.idea/
|
||||
|
||||
/cmake-build-debug/
|
||||
|
||||
/cmake-build-release/
|
||||
|
|
|
@ -835,13 +835,7 @@ 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)
|
||||
|
||||
# Generate version info for both build-tree and install-tree.
|
||||
configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config-version.cmake.in
|
||||
|
@ -938,6 +932,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}")
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue