Dirs restructured

Author: lexus2k

CMakeLists.txt

@@ -11,7 +11,7 @@ if (NOT DEFINED COMPONENT_DIR)
     set(CMAKE_CXX_STANDARD 11)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/cmake ${CMAKE_CURRENT_LIST_DIR}/bs)
+    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/bs)
 
     include(ExternalProject)
     include(package-linker)
@@ -22,7 +22,7 @@ if (NOT DEFINED COMPONENT_DIR)
 
     add_library(tinyslip STATIC ${HEADER_FILES} ${SOURCE_FILES})
 
-    link_external_package(tinyhal ${CMAKE_CURRENT_LIST_DIR}/tinyhal)
+    link_external_package(tinyhal ${CMAKE_CURRENT_LIST_DIR}/deps/tinyhal)
 
     if (EXAMPLES)
         add_subdirectory(examples/linux/loopback)

Makefile

@@ -43,8 +43,7 @@ endif
 ###################### Added HAL library #########################
 
 PKG = tinyhal
-$(PKG)_SRCDIR = ./tinyhal
-$(PKG)_PKGCONFIG = tinyhal.pc
+$(PKG)_SRCDIR = ./deps/tinyhal
 $(eval $(package-make))
 
 ##################################################################

bs/package-linker.cmake

@@ -3,7 +3,7 @@ macro(link_external_package _NAME _PATH)
     if (NOT DEFINED USE_EXTERNAL_${_NAME})
         if (EXISTS ${_PATH}/CMakeLists.txt)
             ExternalProject_Add(${_NAME}_external
-                SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${_NAME}"
+                SOURCE_DIR "${_PATH}"
                 CMAKE_CACHE_ARGS
                     -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/${_NAME}
             )
@@ -20,6 +20,7 @@ macro(link_external_package _NAME _PATH)
         target_link_libraries(${PROJECT_NAME} PRIVATE ${_NAME})
         include_directories(${CMAKE_CURRENT_BINARY_DIR}/${_NAME}/usr/include)
         link_directories(${CMAKE_CURRENT_BINARY_DIR}/${_NAME}/usr/lib)
+        set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_BINARY_DIR}/${_NAME}/usr/share/cmake)
     else()
         find_package(${_NAME} REQUIRED)
         set(__local_PKG__INCLUDE_DIR "${NAME}_INCLUDE_DIRS")

tinyhal/.codedocs deps/tinyhal/.codedocs

@@ -27,6 +27,8 @@ if (NOT DEFINED COMPONENT_DIR)
         string(SUBSTRING ${DIR} ${SLEN} -1 DIR)
         install(FILES ${HFILE} DESTINATION usr/include/${DIR})
     endforeach()
+    install(FILES tinyhal.pc DESTINATION usr/lib/pkgconfig/)
+    install(FILES Findtinyhal.cmake DESTINATION usr/share/cmake/)
 
     if (UNITTEST)
         add_subdirectory(unittest)

tinyhal/.gitignore deps/tinyhal/.gitignore

@@ -45,9 +45,10 @@ ifdef CONFIG_FOR_WINDOWS_BUILD
 	xcopy src $(DESTDIR)\include /y /s &\
 	for /R $(DESTDIR)\include %%G in (*) do ( if not %%~xG==.h del /F/Q/S %%G )
 else
-	mkdir -p $(DESTDIR)/usr/include $(DESTDIR)/usr/lib
+	mkdir -p $(DESTDIR)/usr/include $(DESTDIR)/usr/lib $(DESTDIR)/usr/lib/pkgconfig
 	cp -r $(BLD)/$(TARGET_LIB) $(DESTDIR)/usr/lib/
 	DST=`realpath $(DESTDIR)` && cd src && find ./ -name \*.h -exec cp --parents {} $${DST}/usr/include/ \; && cd ..
+	cp -f tinyhal.pc $(DESTDIR)/usr/lib/pkgconfig/
 endif
 
 docs: