Skip to content

Avoid path doubling issue in CMake files #3623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hmenke wants to merge 1 commit into from
+5 −5
Closed

Avoid path doubling issue in CMake files #3623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/lws_config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#endif

#define LWS_INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/share"
#define LWS_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${LWS_INSTALL_LIB_DIR}"
#define LWS_INSTALL_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}"
#define LWS_PLUGIN_DIR "${LWS_INSTALL_PLUGIN_DIR}"
#define LWS_LIBRARY_VERSION_MAJOR ${LWS_LIBRARY_VERSION_MAJOR}
#define LWS_LIBRARY_VERSION_MINOR ${LWS_LIBRARY_VERSION_MINOR}
Expand Down
8 changes: 4 additions & 4 deletions lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,8 @@ endif()
file(WRITE "${PROJECT_BINARY_DIR}/libwebsockets.pc"
"prefix=\"${CMAKE_INSTALL_PREFIX}\"
exec_prefix=\${prefix}
libdir=\${exec_prefix}/${LWS_INSTALL_LIB_DIR}
includedir=\${prefix}/${LWS_INSTALL_INCLUDE_DIR}
libdir=${CMAKE_INSTALL_FULL_LIBDIR}
includedir=${CMAKE_INSTALL_FULL_INCLUDEDIR}

Name: libwebsockets
Description: Websockets server and client library
Expand All @@ -451,8 +451,8 @@ endif()
file(WRITE "${PROJECT_BINARY_DIR}/libwebsockets_static.pc"
"prefix=\"${CMAKE_INSTALL_PREFIX}\"
exec_prefix=\${prefix}
libdir=\${exec_prefix}/${LWS_INSTALL_LIB_DIR}
includedir=\${prefix}/${LWS_INSTALL_INCLUDE_DIR}
libdir=${CMAKE_INSTALL_FULL_LIBDIR}
includedir=${CMAKE_INSTALL_FULL_INCLUDEDIR}

Name: libwebsockets_static
Description: Websockets server and client static library
Expand Down
Loading