make: work with abs paths

Author: lws-team

CMakeLists.txt

@@ -680,6 +680,20 @@ set(LWS_INSTALL_INCLUDE_DIR   ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installati
 set(LWS_INSTALL_EXAMPLES_DIR  ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation directory for example files")
 set(LWS_INSTALL_PLUGIN_DIR    "${CMAKE_INSTALL_PREFIX}/share/libwebsockets-test-server/plugins" CACHE PATH "Installation directory for plugins")
 
+if(IS_ABSOLUTE "${LWS_INSTALL_LIB_DIR}")
+	set(LWS_ABSOLUTE_INSTALL_LIBDIR "${LWS_INSTALL_LIB_DIR}")
+	set(PKG_CONFIG_LIBDIR "${LWS_INSTALL_LIB_DIR}")
+else()
+	set(LWS_ABSOLUTE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${LWS_INSTALL_LIB_DIR}")
+	set(PKG_CONFIG_LIBDIR "\${exec_prefix}/${LWS_INSTALL_LIB_DIR}")
+endif()
+
+if(IS_ABSOLUTE "${LWS_INSTALL_INCLUDE_DIR}")
+	set(PKG_CONFIG_INCLUDEDIR "${LWS_INSTALL_INCLUDE_DIR}")
+else()
+	set(PKG_CONFIG_INCLUDEDIR "\${prefix}/${LWS_INSTALL_INCLUDE_DIR}")
+endif()
+
 # if you gave LWS_WITH_MINIZ, point to MINIZ here if not found
 # automatically
 

cmake/lws_config.h.in

@@ -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 "${LWS_ABSOLUTE_INSTALL_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}

lib/CMakeLists.txt

@@ -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=${PKG_CONFIG_LIBDIR}
+includedir=${PKG_CONFIG_INCLUDEDIR}
 
 Name: libwebsockets
 Description: Websockets server and client library
@@ -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=${PKG_CONFIG_LIBDIR}
+includedir=${PKG_CONFIG_INCLUDEDIR}
 
 Name: libwebsockets_static
 Description: Websockets server and client static library