From e3adff1f7813b8e8ead567889f28ee78908f98b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Wed, 4 Mar 2020 20:59:11 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@896
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 CMakeLists.txt                            | 5 +++--
 utils/code_model_generator/CMakeLists.txt | 4 +++-
 utils/crypt_tool/CMakeLists.txt           | 4 +++-
 utils/resources_compiler/CMakeLists.txt   | 4 +++-
 utils/system_daemon/CMakeLists.txt        | 4 +++-
 utils/udp_file_transfer/CMakeLists.txt    | 4 +++-
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f9a9179..bb997686 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -565,8 +565,9 @@ if(LIB)
 else()
 	if(NOT PIP_FREERTOS)
 		install(TARGETS ${PIP_LIBS_TARGETS} DESTINATION bin)
-		install(FILES ${HDRS} DESTINATION include)
-		message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
+		install(TARGETS ${PIP_LIBS_TARGETS} DESTINATION lib)
+		install(FILES ${HDRS} DESTINATION include/pip)
+		message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
 	endif()
 endif()
 
diff --git a/utils/code_model_generator/CMakeLists.txt b/utils/code_model_generator/CMakeLists.txt
index ce5e6282..4b04d1b8 100755
--- a/utils/code_model_generator/CMakeLists.txt
+++ b/utils/code_model_generator/CMakeLists.txt
@@ -3,4 +3,6 @@ add_executable(pip_cmg "main.cpp")
 target_link_libraries(pip_cmg pip)
 if (DEFINED LIB)
 	install(TARGETS pip_cmg DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-endif ()
+else()
+	install(TARGETS pip_cmg DESTINATION bin)
+endif()
diff --git a/utils/crypt_tool/CMakeLists.txt b/utils/crypt_tool/CMakeLists.txt
index 17a03f8a..302631d0 100644
--- a/utils/crypt_tool/CMakeLists.txt
+++ b/utils/crypt_tool/CMakeLists.txt
@@ -3,4 +3,6 @@ add_executable(picrypt "main.cpp")
 target_link_libraries(picrypt pip pip_crypt)
 if (DEFINED LIB)
 	install(TARGETS picrypt DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-endif ()
+else()
+	install(TARGETS picrypt DESTINATION bin)
+endif()
diff --git a/utils/resources_compiler/CMakeLists.txt b/utils/resources_compiler/CMakeLists.txt
index 50f1b1eb..84a014c0 100644
--- a/utils/resources_compiler/CMakeLists.txt
+++ b/utils/resources_compiler/CMakeLists.txt
@@ -6,4 +6,6 @@ set (PIRC_LIBS pip)
 target_link_libraries(pip_rc ${PIRC_LIBS})
 if (DEFINED LIB)
 	install(TARGETS pip_rc DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-endif ()
+else()
+	install(TARGETS pip_rc DESTINATION bin)
+endif()
diff --git a/utils/system_daemon/CMakeLists.txt b/utils/system_daemon/CMakeLists.txt
index fa506b4b..1eb58c6f 100755
--- a/utils/system_daemon/CMakeLists.txt
+++ b/utils/system_daemon/CMakeLists.txt
@@ -5,4 +5,6 @@ add_executable(pisd ${CPPS} ${HDRS})
 target_link_libraries(pisd pip pip_crypt)
 if (DEFINED LIB)
 	install(TARGETS pisd DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-endif ()
+else()
+	install(TARGETS pisd DESTINATION bin)
+endif()
diff --git a/utils/udp_file_transfer/CMakeLists.txt b/utils/udp_file_transfer/CMakeLists.txt
index c7cf3e8c..6333c33a 100644
--- a/utils/udp_file_transfer/CMakeLists.txt
+++ b/utils/udp_file_transfer/CMakeLists.txt
@@ -3,4 +3,6 @@ add_executable(pift "main.cpp")
 target_link_libraries(pift pip)
 if (DEFINED LIB)
 	install(TARGETS pift DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-endif ()
+else()
+	install(TARGETS pift DESTINATION bin)
+endif()