Install ergoCubEmotions application even with COMPILE_ergoCubEmotions…

… off (#196)
icub-tech-iit · Dec 11, 2023 · 91efee5 · 91efee5
2 parents 54e0909 + 8340017
commit 91efee5
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 21 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,6 +9,8 @@ cmake_minimum_required(VERSION 3.12)
 project(ergocub-software
         VERSION 0.6.0)
 
+find_package(YARP 3.7.2 REQUIRED)
+
 # Give error if add_dependencies is called on a non-existing target
 if(POLICY CMP0046)
   cmake_policy(SET CMP0046 NEW)
@@ -40,6 +42,8 @@ if (BUILD_TESTING)
   add_subdirectory(tests)
 endif()
 
+add_subdirectory(app)
+
 if(COMPILE_ergoCubEmotions)
   add_subdirectory(src)
 endif()

diff --git a/README.md b/README.md
@@ -3,6 +3,10 @@ Main collector of ergoCub specific SW
 
 ## Installation
 
+### Dependencies
+
+Before installing `ergocub-software`, please be sure that you've installed [YARP](https://www.yarp.it/latest//) on your machine.
+
 ### Compiling from source
 
 For installing it just:

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -0,0 +1,8 @@
+################################################################################
+#                                                                              #
+# Copyright (C) 2023 Fondazione Istitito Italiano di Tecnologia (IIT)          #
+# All Rights Reserved.                                                         #
+#                                                                              #
+################################################################################
+
+add_subdirectory(ergoCubEmotions)
diff --git a/app/ergoCubEmotions/CMakeLists.txt b/app/ergoCubEmotions/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright (C) 2006-2022 Istituto Italiano di Tecnologia (IIT)
+# All rights reserved.
+#
+# This software may be modified and distributed under the terms of the
+# BSD-3-Clause license. See the accompanying LICENSE file for details.
+
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/conf/config.ini DESTINATION ${YARP_CONTEXTS_INSTALL_DIR}/${PROJECT_NAME})
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/emotionHandler.xml DESTINATION ${YARP_APPLICATIONS_INSTALL_DIR}/${PROJECT_NAME})
diff --git a/...dules/ergoCubEmotions/app/conf/config.ini → app/ergoCubEmotions/conf/config.ini b/...dules/ergoCubEmotions/app/conf/config.ini → app/ergoCubEmotions/conf/config.ini
diff --git a/...ubEmotions/app/scripts/emotionHandler.xml → ...rgoCubEmotions/scripts/emotionHandler.xml b/...ubEmotions/app/scripts/emotionHandler.xml → ...rgoCubEmotions/scripts/emotionHandler.xml
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
-################################################################################
-#                                                                              #
-# Copyright (C) 2023 Fondazione Istitito Italiano di Tecnologia (IIT)          #
-# All Rights Reserved.                                                         #
-#                                                                              #
-################################################################################
+# Copyright (C) 2006-2022 Istituto Italiano di Tecnologia (IIT)
+# All rights reserved.
+#
+# This software may be modified and distributed under the terms of the
+# BSD-3-Clause license. See the accompanying LICENSE file for details.
+
 add_subdirectory(modules)
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
@@ -1,7 +1,7 @@
-################################################################################
-#                                                                              #
-# Copyright (C) 2023 Fondazione Istitito Italiano di Tecnologia (IIT)          #
-# All Rights Reserved.                                                         #
-#                                                                              #
-################################################################################
+# Copyright (C) 2006-2022 Istituto Italiano di Tecnologia (IIT)
+# All rights reserved.
+#
+# This software may be modified and distributed under the terms of the
+# BSD-3-Clause license. See the accompanying LICENSE file for details.
+
 add_subdirectory(ergoCubEmotions)
diff --git a/src/modules/ergoCubEmotions/CMakeLists.txt b/src/modules/ergoCubEmotions/CMakeLists.txt
@@ -1,14 +1,12 @@
-################################################################################
-#                                                                              #
-# Copyright (C) 2023 Fondazione Istitito Italiano di Tecnologia (IIT)          #
-# All Rights Reserved.                                                         #
-#                                                                              #
-################################################################################
+# Copyright (C) 2006-2022 Istituto Italiano di Tecnologia (IIT)
+# All rights reserved.
+#
+# This software may be modified and distributed under the terms of the
+# BSD-3-Clause license. See the accompanying LICENSE file for details.
 
 project(ergoCubEmotions)
 cmake_minimum_required(VERSION 3.12)
 
-find_package(YARP 3.7.2 REQUIRED)
 find_package(OpenCV 4.2.0 REQUIRED)
 
 set(doc_files ${PROJECT_NAME}.xml)
@@ -18,8 +16,6 @@ source_group("IDL Files" FILES idl.thrift)
 source_group("DOC Files" FILES ${doc_files})
 add_executable(${PROJECT_NAME} ergoCubEmotions.cpp ergoCubEmotions.h main.cpp idl.thrift ${IDL_GEN_FILES} ${doc_files})
 
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/app/conf/config.ini DESTINATION ${YARP_CONTEXTS_INSTALL_DIR}/${PROJECT_NAME})
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/app/scripts/emotionHandler.xml DESTINATION ${YARP_APPLICATIONS_INSTALL_DIR}/${PROJECT_NAME})
 install(DIRECTORY expressions DESTINATION ${YARP_CONTEXTS_INSTALL_DIR}/${PROJECT_NAME})
 
 # Link the application with YARP and OpenCV libraries