From 1c2b6d59da54e972d0fe62e0582491a6303a4a10 Mon Sep 17 00:00:00 2001
From: Benjamin Sergeant <“bsergean@gmail.com”>
Date: Sun, 21 Apr 2019 11:41:37 -0700
Subject: [PATCH] Fix #37 / add directives to install headers and library

---
 CMakeLists.txt |  9 ++++++++-
 makefile       | 11 ++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92f15bef..7dd2bed1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,7 +111,7 @@ if (APPLE AND USE_TLS)
   target_link_libraries(ixwebsocket "-framework foundation" "-framework security")
 endif()
 
-if(USE_OPEN_SSL)
+if (USE_OPEN_SSL)
   find_package(OpenSSL REQUIRED)
   add_definitions(${OPENSSL_DEFINITIONS})
   message(STATUS "OpenSSL: " ${OPENSSL_VERSION})
@@ -139,6 +139,13 @@ set( IXWEBSOCKET_INCLUDE_DIRS
 
 target_include_directories( ixwebsocket PUBLIC ${IXWEBSOCKET_INCLUDE_DIRS} )
 
+set_target_properties(ixwebsocket PROPERTIES PUBLIC_HEADER "${IXWEBSOCKET_HEADERS}")
+
+install(TARGETS ixwebsocket
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ixwebsocket/
+)
+
 if (NOT WIN32)
     add_subdirectory(ws)
 endif()
diff --git a/makefile b/makefile
index 6e64f961..831d3cf1 100644
--- a/makefile
+++ b/makefile
@@ -5,6 +5,7 @@ all: brew
 
 install: brew
 
+# Use -DCMAKE_INSTALL_PREFIX= to install into another location
 brew:
 	mkdir -p build && (cd build ; cmake -DUSE_TLS=1 .. ; make -j install)
 
@@ -31,14 +32,6 @@ run:
 trail:
 	sh third_party/remote_trailing_whitespaces.sh
 
-build:
-	(cd examples/satori_publisher ; mkdir -p build ; cd build ; cmake .. ; make)
-	(cd examples/chat ; mkdir -p build ; cd build ; cmake .. ; make)
-	(cd examples/ping_pong ; mkdir -p build ; cd build ; cmake .. ; make)
-	(cd examples/ws_connect ; mkdir -p build ; cd build ; cmake .. ; make)
-	(cd examples/echo_server ; mkdir -p build ; cd build ; cmake .. ; make)
-	(cd examples/broadcast_server ; mkdir -p build ; cd build ; cmake .. ; make)
-
 # That target is used to start a node server, but isn't required as we have 
 # a builtin C++ server started in the unittest now
 test_server:
@@ -62,7 +55,7 @@ rebase_upstream:
 
 install_cmake_for_linux:
 	mkdir -p /tmp/cmake
-	(cd /tmp/cmake ; curl -L -O https://github.com/Kitware/CMake/releases/download/v3.14.0-rc4/cmake-3.14.0-rc4-Linux-x86_64.tar.gz ; tar zxf cmake-3.14.0-rc4-Linux-x86_64.tar.gz)
+	(cd /tmp/cmake ; curl -L -O https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Linux-x86_64.tar.gz ; tar zxf cmake-3.14.0-Linux-x86_64.tar.gz)
 
 .PHONY: test
 .PHONY: build