cmake: create build/include

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb1b613..579a29c 100644 (file)
--- 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 9b7edd1..a61649f 100644 (file)
--- 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