From df072e55ef4409d9ab9f0cd3155f1eba35bbf223 Mon Sep 17 00:00:00 2001
From: Thomas Moulard <thomas.moulard@gmail.com>
Date: Tue, 28 Sep 2010 03:47:47 +0200
Subject: [PATCH] Install binaries in bin directory.
---
tools/CMakeLists.txt | 15 +++++++--------
.../{shell.sh.cmake => sot-shell-plugin.sh.cmake} | 2 +-
tools/{test_shell.cpp => sot-shell.cpp} | 0
3 files changed, 8 insertions(+), 9 deletions(-)
rename tools/{shell.sh.cmake => sot-shell-plugin.sh.cmake} (77%)
rename tools/{test_shell.cpp => sot-shell.cpp} (100%)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 5a68f53..0ed3b94 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -4,17 +4,17 @@
### tools
SET(tools
- test_shell
+ sot-shell
)
### Configure shell launch script
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/shell.sh.cmake
- ${${PROJECT_NAME}_BINARY_DIR}/tools/shell.sh)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/sot-shell-plugin.sh.cmake
+ ${${PROJECT_NAME}_BINARY_DIR}/tools/sot-shell-plugin.sh)
INSTALL(
FILES
- ${${PROJECT_NAME}_BINARY_DIR}/tools/shell.sh
+ ${${PROJECT_NAME}_BINARY_DIR}/tools/sot-shell-plugin.sh
DESTINATION
- bin/${PROJECT_NAME}
+ bin
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ )
@@ -39,6 +39,5 @@ FOREACH(tool_name ${tools})
TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} dl)
ENDIF(UNIX)
- INSTALL(TARGETS ${tool_name}
- DESTINATION bin/${PROJECT_NAME})
-ENDFOREACH(tool_name)
\ No newline at end of file
+ INSTALL(TARGETS ${tool_name} DESTINATION bin)
+ENDFOREACH(tool_name)
diff --git a/tools/shell.sh.cmake b/tools/sot-shell-plugin.sh.cmake
similarity index 77%
rename from tools/shell.sh.cmake
rename to tools/sot-shell-plugin.sh.cmake
index a01b0d6..73ae865 100644
--- a/tools/shell.sh.cmake
+++ b/tools/sot-shell-plugin.sh.cmake
@@ -2,4 +2,4 @@
echo "-- Launching dynamic-graph C shell with default plugins"
echo "loadPlugin ${CMAKE_INSTALL_PREFIX}/lib/plugin/shell-functions.so" > /tmp/default_script
echo "loadPlugin ${CMAKE_INSTALL_PREFIX}/lib/plugin/shell-procedure.so" >> /tmp/default_script
-${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}/test_shell /tmp/default_script
+${CMAKE_INSTALL_PREFIX}/bin/sot-shell /tmp/default_script
diff --git a/tools/test_shell.cpp b/tools/sot-shell.cpp
similarity index 100%
rename from tools/test_shell.cpp
rename to tools/sot-shell.cpp
--
GitLab