From 4ca114fbcfbf012f92104d8b08edd8c4ab91883b Mon Sep 17 00:00:00 2001
From: Andy Green <andy@warmcat.com>
Date: Tue, 28 Feb 2017 07:51:56 +0800
Subject: [PATCH] cmake: create build/include

---
 CMakeLists.txt | 24 ++++++++++++++++++++++++
 component.mk   |  6 +-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb1b6134..579a29c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -734,6 +734,17 @@ if (LWS_WITH_STATIC)
 			PROPERTIES
 			OUTPUT_NAME websockets_static)
 	endif()
+	add_custom_command(
+		      TARGET websockets
+		      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/lib/libwebsockets.h
+		     					 ${CMAKE_BINARY_DIR}/include/libwebsockets.h
+	)
+	add_custom_command(
+		      TARGET websockets
+		      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lws_config.h
+		     					 ${CMAKE_BINARY_DIR}/include/lws_config.h
+	)
+
 endif()
 
 if (LWS_WITH_SHARED)
@@ -761,6 +772,19 @@ if (LWS_WITH_SHARED)
 	if (APPLE)
 		set_property(TARGET websockets_shared PROPERTY MACOSX_RPATH YES)
 	endif()
+
+	add_custom_command(
+		      TARGET websockets_shared
+		      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/lib/libwebsockets.h
+		     					 ${CMAKE_BINARY_DIR}/include/libwebsockets.h
+	)
+	add_custom_command(
+		      TARGET websockets_shared
+		      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lws_config.h
+		     					 ${CMAKE_BINARY_DIR}/include/lws_config.h
+	)
+
+
 endif()
 
 # Set the so version of the lib.
diff --git a/component.mk b/component.mk
index 9b7edd1b..a61649f2 100644
--- a/component.mk
+++ b/component.mk
@@ -1,4 +1,4 @@
-COMPONENT_ADD_INCLUDEDIRS := ../../../../../../../../../$(COMPONENT_BUILD_DIR)/include-ext
+COMPONENT_ADD_INCLUDEDIRS := ../../../../../../../../../$(COMPONENT_BUILD_DIR)/include
 
 COMPONENT_OWNBUILDTARGET:= 1
 
@@ -21,10 +21,6 @@ build:
 		-DCMAKE_BUILD_TYPE=RELEASE \
 		-DLWS_WITH_NO_LOGS=0 \
 		-DLWS_WITH_ESP32=1 ;\
-	mkdir -p $(COMPONENT_BUILD_DIR)/include-ext ; \
-	cp $(COMPONENT_PATH)/lib/libwebsockets.h \
-	   $(COMPONENT_BUILD_DIR)/lws_config.h \
-	   $(COMPONENT_BUILD_DIR)/include-ext ; \
 	make VERBOSE=1 && \
 	cp ${COMPONENT_BUILD_DIR}/lib/libwebsockets.a ${COMPONENT_BUILD_DIR}/liblibwebsockets.a