From 0da92ea6ea3c922e82b51e7aa29acf514235ca15 Mon Sep 17 00:00:00 2001 From: Marco Randazzo Date: Wed, 13 May 2015 14:01:48 +0200 Subject: [PATCH] removed installation from icub-firmware-shared --- CMakeLists.txt | 38 +++++++++++++++++++++----------------- can/CMakeLists.txt | 4 ++-- eth/CMakeLists.txt | 8 ++++---- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 392fa9022..b9960ca8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.8.7) -project(icub_firmware_shared) +project(icub_firmware_shared NONE) list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) @@ -15,7 +15,7 @@ set(icub_firmware_shared_VERSION ${icub_firmware_shared_MAJOR_VERSION}.${icub_fi include(CMakePackageConfigHelpers) -include(GNUInstallDirs) +#include(GNUInstallDirs) include(FeatureSummary) @@ -50,8 +50,8 @@ write_basic_package_version_file(${CMAKE_BINARY_DIR}/icub_firmware_shared-config VERSION ${icub_firmware_shared_VERSION} COMPATIBILITY ExactVersion) -install(FILES ${CMAKE_BINARY_DIR}/icub_firmware_shared-config-version.cmake - DESTINATION ${icub_firmware_shared_CMAKE_DESTINATION}) +#install(FILES ${CMAKE_BINARY_DIR}/icub_firmware_shared-config-version.cmake +# DESTINATION ${icub_firmware_shared_CMAKE_DESTINATION}) # icub_firmware_shared-config.cmake (build tree) @@ -65,18 +65,18 @@ configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/icub_firmware_shared-c PATH_VARS ${path_vars}) # icub_firmware_shared-config.cmake (installed) -foreach(target ${targets}) - get_property(icub_firmware_shared_${target}_INCLUDE_DIR GLOBAL PROPERTY icub_firmware_shared_${target}_INSTALL_INCLUDE_DIR) - get_filename_component(icub_firmware_shared_${target}_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${icub_firmware_shared_${target}_INCLUDE_DIR}" ABSOLUTE) -endforeach() -configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/icub_firmware_shared-config.cmake.in - ${CMAKE_BINARY_DIR}/icub_firmware_shared-config.cmake.install - INSTALL_DESTINATION ${icub_firmware_shared_CMAKE_DESTINATION} - PATH_VARS ${path_vars}) - -install(FILES ${CMAKE_BINARY_DIR}/icub_firmware_shared-config.cmake.install - DESTINATION ${icub_firmware_shared_CMAKE_DESTINATION} - RENAME icub_firmware_shared-config.cmake) +#foreach(target ${targets}) +# get_property(icub_firmware_shared_${target}_INCLUDE_DIR GLOBAL PROPERTY icub_firmware_shared_${target}_INSTALL_INCLUDE_DIR) +# get_filename_component(icub_firmware_shared_${target}_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${icub_firmware_shared_${target}_INCLUDE_DIR}" ABSOLUTE) +#endforeach() +#configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/icub_firmware_shared-config.cmake.in +# ${CMAKE_BINARY_DIR}/icub_firmware_shared-config.cmake.install +# INSTALL_DESTINATION ${icub_firmware_shared_CMAKE_DESTINATION} +# PATH_VARS ${path_vars}) +# +#install(FILES ${CMAKE_BINARY_DIR}/icub_firmware_shared-config.cmake.install +# DESTINATION ${icub_firmware_shared_CMAKE_DESTINATION} +# RENAME icub_firmware_shared-config.cmake) # # icub_firmware_shared-targets.cmake (build tree) @@ -91,4 +91,8 @@ install(FILES ${CMAKE_BINARY_DIR}/icub_firmware_shared-config.cmake.install # DESTINATION ${icub_firmware_shared_CMAKE_DESTINATION} # FILE icub_firmware_shared-targets.cmake) -include(AddUninstallTarget) +#include(AddUninstallTarget) + +set_property (CACHE CMAKE_INSTALL_PREFIX PROPERTY TYPE INTERNAL) +set_property (CACHE WITH_CANPROTOCOLLIB PROPERTY TYPE INTERNAL) +set_property (CACHE WITH_EMBOBJ PROPERTY TYPE INTERNAL) \ No newline at end of file diff --git a/can/CMakeLists.txt b/can/CMakeLists.txt index 9071e64a6..cb8d493e3 100644 --- a/can/CMakeLists.txt +++ b/can/CMakeLists.txt @@ -5,8 +5,8 @@ project(canProtocolLib NONE) if(WITH_CANPROTOCOLLIB) - install(DIRECTORY canProtocolLib - DESTINATION ${icub_firmware_shared_INCLUDE_DIR}) + #install(DIRECTORY canProtocolLib + # DESTINATION ${icub_firmware_shared_INCLUDE_DIR}) endif() set_property(GLOBAL APPEND PROPERTY icub_firmware_shared_TARGETS canProtocolLib) set_property(GLOBAL PROPERTY icub_firmware_shared_canProtocolLib_BUILD_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/eth/CMakeLists.txt b/eth/CMakeLists.txt index 3933ba247..cc136ec2d 100644 --- a/eth/CMakeLists.txt +++ b/eth/CMakeLists.txt @@ -5,10 +5,10 @@ project(embobj NONE) if(WITH_EMBOBJ) - install(DIRECTORY embobj - DESTINATION ${icub_firmware_shared_INCLUDE_DIR}) - install(DIRECTORY robotconfig - DESTINATION ${icub_firmware_shared_INCLUDE_DIR}) + #install(DIRECTORY embobj + # DESTINATION ${icub_firmware_shared_INCLUDE_DIR}) + #install(DIRECTORY robotconfig + # DESTINATION ${icub_firmware_shared_INCLUDE_DIR}) endif() set_property(GLOBAL APPEND PROPERTY icub_firmware_shared_TARGETS embobj)