Skip to content

Commit

Permalink
removed installation from icub-firmware-shared
Browse files Browse the repository at this point in the history
  • Loading branch information
randaz81 committed May 13, 2015
1 parent 310b9bd commit 0da92ea
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 23 deletions.
38 changes: 21 additions & 17 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -15,7 +15,7 @@ set(icub_firmware_shared_VERSION ${icub_firmware_shared_MAJOR_VERSION}.${icub_fi


include(CMakePackageConfigHelpers)
include(GNUInstallDirs)
#include(GNUInstallDirs)
include(FeatureSummary)


Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
4 changes: 2 additions & 2 deletions can/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
8 changes: 4 additions & 4 deletions eth/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 0da92ea

Please sign in to comment.