1*4882a593SmuzhiyunFrom 771d79eeb0ac5079482a4b3a131bbda744793e7d Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Thu, 19 Dec 2019 20:07:11 -0800 4*4882a593SmuzhiyunSubject: [PATCH] cmake: Use GNUInstallDirs 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunHelps install cmakefiles in right libdir 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunUpstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/854] 9*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun CMakeLists.txt | 4 +++- 12*4882a593Smuzhiyun 1 file changed, 3 insertions(+), 1 deletion(-) 13*4882a593Smuzhiyun 14*4882a593Smuzhiyundiff --git a/CMakeLists.txt b/CMakeLists.txt 15*4882a593Smuzhiyunindex 2786aba..080be3e 100644 16*4882a593Smuzhiyun--- a/CMakeLists.txt 17*4882a593Smuzhiyun+++ b/CMakeLists.txt 18*4882a593Smuzhiyun@@ -39,11 +39,13 @@ endif() 19*4882a593Smuzhiyun 20*4882a593Smuzhiyun set_property(GLOBAL PROPERTY USE_FOLDERS ON) 21*4882a593Smuzhiyun 22*4882a593Smuzhiyun+include(GNUInstallDirs) 23*4882a593Smuzhiyun+ 24*4882a593Smuzhiyun set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files") 25*4882a593Smuzhiyun if (WIN32 AND NOT CYGWIN) 26*4882a593Smuzhiyun set (DEF_INSTALL_CMAKE_DIR cmake) 27*4882a593Smuzhiyun else () 28*4882a593Smuzhiyun- set (DEF_INSTALL_CMAKE_DIR lib/cmake/websocketpp) 29*4882a593Smuzhiyun+ set (DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/websocketpp) 30*4882a593Smuzhiyun endif () 31*4882a593Smuzhiyun set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun-- 34*4882a593Smuzhiyun2.24.1 35*4882a593Smuzhiyun 36