Fixes to install

This commit is contained in:
nkoenig 2012-10-29 21:37:43 +00:00
parent c49c347efd
commit 42a1535089

View File

@ -5,7 +5,7 @@ if(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0004 NEW) CMAKE_POLICY(SET CMP0004 NEW)
endif(COMMAND CMAKE_POLICY) endif(COMMAND CMAKE_POLICY)
set (CMAKE_INSTALL_PREFIX /usr CACHE STRING "Install path prefix") set (CMAKE_INSTALL_PREFIX /usr/share CACHE STRING "Install path prefix")
project (gazebo_models) project (gazebo_models)
string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER) string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
@ -70,22 +70,22 @@ youbot
set (MODEL_URI_LIST "" CACHE INTERNAL "Model URI List" FORCE) set (MODEL_URI_LIST "" CACHE INTERNAL "Model URI List" FORCE)
foreach (dir ${dirs}) foreach (dir ${dirs})
add_custom_target(${dir} ALL COMMAND tar czvf ${dir}.tar.gz ../${dir}) add_custom_target(${dir} ALL COMMAND mkdir -p ${PROJECT_BINARY_DIR}/${dir}
install (DIRECTORY ${dir} DESTINATION COMMAND tar czvf ${PROJECT_BINARY_DIR}/${dir}/model.tar.gz ../${dir})
${CMAKE_INSTALL_PREFIX}/share/models)
install (FILES ${PROJECT_BINARY_DIR}/${dir}.tar.gz DESTINATION install (DIRECTORY ${dir} DESTINATION ${CMAKE_INSTALL_PREFIX}/models)
${CMAKE_INSTALL_PREFIX}/share/models/${dir}) install (FILES ${PROJECT_BINARY_DIR}/${dir}/model.tar.gz DESTINATION
${CMAKE_INSTALL_PREFIX}/models/${dir})
set(MODEL_URI_LIST "${MODEL_URI_LIST}<uri>file://${dir}</uri>\n") set(MODEL_URI_LIST "${MODEL_URI_LIST}<uri>file://${dir}</uri>\n")
#CACHE INTERNAL "Model URI List" FORCE)
endforeach () endforeach ()
configure_file("${CMAKE_SOURCE_DIR}/manifest.xml.in" configure_file("${CMAKE_SOURCE_DIR}/manifest.xml.in"
"${PROJECT_BINARY_DIR}/manifest.xml") "${PROJECT_BINARY_DIR}/manifest.xml")
install (FILES "${PROJECT_BINARY_DIR}/manifest.xml" DESTINATION install (FILES "${PROJECT_BINARY_DIR}/manifest.xml" DESTINATION
${CMAKE_INSTALL_PREFIX}/share/models/) ${CMAKE_INSTALL_PREFIX}/models/)
message (STATUS "Install path: ${CMAKE_INSTALL_PREFIX}/share/models") message (STATUS "Install path: ${CMAKE_INSTALL_PREFIX}/models")
# This must always be last! # This must always be last!
include(CPack) include(CPack)