From 2dfbbf80b768e5477fb39dffb5ab58f61c43521d Mon Sep 17 00:00:00 2001
From: Ivan Pelipenko <peri4ko@yandex.ru>
Date: Sun, 28 Jun 2020 01:03:29 +0300
Subject: [PATCH] clean, fix FindPIP.cmake

---
 CMakeLists.txt                 |  2 +-
 clean                          | 24 ------------------------
 clean.bat                      | 34 ----------------------------------
 cmake/FindPIP.cmake            |  5 ++++-
 Doxyfile.in => doc/Doxyfile.in |  0
 5 files changed, 5 insertions(+), 60 deletions(-)
 delete mode 100644 clean
 delete mode 100644 clean.bat
 rename Doxyfile.in => doc/Doxyfile.in (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4b1123f..60b3f2b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -757,7 +757,7 @@ if ((NOT PIP_FREERTOS) AND (NOT CROSSTOOLS))
 		endforeach(F)
 		string(REPLACE ";" " " DOXY_INPUT "${DOXY_INPUT}")
 		string(REPLACE ";" " " DOXY_INCLUDE_PATH "${PIP_MAIN_FOLDERS}")
-		add_documentation(doc Doxyfile.in)
+		add_documentation(doc doc/Doxyfile.in)
 		install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ../share/doc/pip COMPONENT doc EXCLUDE_FROM_ALL OPTIONAL)
 	endif()
 endif()
diff --git a/clean b/clean
deleted file mode 100644
index c06a0da8..00000000
--- a/clean
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-VERBOSE=1 make clean
-rm -rvf ./CMakeFiles
-rm -vf ./CMakeCache.txt ./Makefile ./cmake_install.cmake ./install_manifest.txt ./*~ ./*cxx ./moc_* ./*.o ./core
-cd utils/system_test
-VERBOSE=1 make clean
-rm -rvf ./CMakeFiles
-rm -vf ./CMakeCache.txt ./Makefile ./cmake_install.cmake ./install_manifest.txt ./*~ ./*cxx ./moc_* ./*.o ./core
-cd ../../
-cd utils/system_daemon
-VERBOSE=1 make clean
-rm -rvf ./CMakeFiles
-rm -vf ./CMakeCache.txt ./Makefile ./cmake_install.cmake ./install_manifest.txt ./*~ ./*cxx ./moc_* ./*.o ./core
-cd ../../
-cd utils/remote_console
-VERBOSE=1 make clean
-rm -rvf ./CMakeFiles
-rm -vf ./CMakeCache.txt ./Makefile ./cmake_install.cmake ./install_manifest.txt ./*~ ./*cxx ./moc_* ./*.o ./core
-cd ../../
-cd utils/code_model_generator
-VERBOSE=1 make clean
-rm -rvf ./CMakeFiles
-rm -vf ./CMakeCache.txt ./Makefile ./cmake_install.cmake ./install_manifest.txt ./*~ ./*cxx ./moc_* ./*.o ./core
-cd ../../
diff --git a/clean.bat b/clean.bat
deleted file mode 100644
index a8f42791..00000000
--- a/clean.bat
+++ /dev/null
@@ -1,34 +0,0 @@
-#make clean
-del /q /f /s CMakeFiles
-rmdir /q /s CMakeFiles
-del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *~ *cxx moc_* *.o *.exe *.a *.dll *.lib core
-cd utils\system_test
-del /q /f /s CMakeFiles
-rmdir /q /s CMakeFiles
-del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *~ *cxx moc_* *.o *.exe *.a *.dll *.lib core
-cd ..
-cd ..
-cd utils\remote_console
-del /q /f /s CMakeFiles
-rmdir /q /s CMakeFiles
-del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *~ *cxx moc_* *.o *.exe *.a *.dll *.lib core
-cd ..
-cd ..
-cd utils\code_model_generator
-del /q /f /s CMakeFiles
-rmdir /q /s CMakeFiles
-del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *~ *cxx moc_* *.o *.exe *.a *.dll *.lib core
-cd ..
-cd ..
-cd utils\system_daemon
-del /q /f /s CMakeFiles
-rmdir /q /s CMakeFiles
-del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *~ *cxx moc_* *.o *.exe *.a *.dll *.lib core
-cd ..
-cd ..
-cd utils\udp_file_transfer
-del /q /f /s CMakeFiles
-rmdir /q /s CMakeFiles
-del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *~ *cxx moc_* *.o *.exe *.a *.dll *.lib core
-cd ..
-cd ..
diff --git a/cmake/FindPIP.cmake b/cmake/FindPIP.cmake
index 1db93014..5b21dc6b 100644
--- a/cmake/FindPIP.cmake
+++ b/cmake/FindPIP.cmake
@@ -3,6 +3,7 @@
 Also create imported targets:
   * PIP - main library
   * PIP::USB
+  * PIP::Console
   * PIP::Crypt
   * PIP::FFTW
   * PIP::Compress
@@ -58,6 +59,7 @@ set(_pip_suffix "")
 
 find_library(PIP_LIBRARY pip${_pip_suffix} HINTS ${_PIP_LIBDIR})
 find_library(PIP_USB_LIBRARY pip_usb${_pip_suffix} HINTS ${_PIP_LIBDIR})
+find_library(PIP_CONSOLE_LIBRARY pip_console${_pip_suffix} HINTS ${_PIP_LIBDIR})
 find_library(PIP_CRYPT_LIBRARY pip_crypt${_pip_suffix} HINTS ${_PIP_LIBDIR})
 find_library(PIP_FFTW_LIBRARY pip_fftw${_pip_suffix} HINTS ${_PIP_LIBDIR})
 find_library(PIP_COMPRESS_LIBRARY pip_compress${_pip_suffix} HINTS ${_PIP_LIBDIR})
@@ -115,8 +117,9 @@ if(PIP_FIND_VERSION VERSION_GREATER PIP_VERSION)
 	message(FATAL_ERROR "PIP version ${PIP_VERSION} is available, but ${PIP_FIND_VERSION} requested!")
 endif()
 
-set(__modules "USB;Crypt;FFTW;Compress;IOUtils;Concurrent;Cloud")
+set(__modules "USB;Crypt;Console;FFTW;Compress;IOUtils;Concurrent;Cloud")
 set(__module_USB        "${PIP_USB_LIBRARY}"       )
+set(__module_Console    "${PIP_CONSOLE_LIBRARY}"   )
 set(__module_Crypt      "${PIP_CRYPT_LIBRARY}"     )
 set(__module_FFTW       "${PIP_FFTW_LIBRARY}"      )
 set(__module_Compress   "${PIP_COMPRESS_LIBRARY}"  )
diff --git a/Doxyfile.in b/doc/Doxyfile.in
similarity index 100%
rename from Doxyfile.in
rename to doc/Doxyfile.in