From 3600d6becd460fae3c61e26c15b51b214c8438ad Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 16 May 2010 16:34:17 +0000 Subject: [PATCH] * All tools: - Change: In the CMakeLists.txt, in all the install commands remove all the leading "/" as they prevents the CMAKE_INSTALL_PREFIX to be took into account. It was nevertheless working because buildCoriolis.py was using DESTDIR which is prepended anyway. * ./goodies: - Change: In buildCoriolis.py, no longer uses the DESTDIR but instead CMAKE_INSTALL_PREFIX. --- solstice/cmake_modules/CMakeLists.txt | 2 +- solstice/src/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/solstice/cmake_modules/CMakeLists.txt b/solstice/cmake_modules/CMakeLists.txt index 46c42f90..2039727c 100644 --- a/solstice/cmake_modules/CMakeLists.txt +++ b/solstice/cmake_modules/CMakeLists.txt @@ -1 +1 @@ -install ( FILES FindSOLSTICE.cmake DESTINATION /share/cmake_modules ) +install ( FILES FindSOLSTICE.cmake DESTINATION share/cmake_modules ) diff --git a/solstice/src/CMakeLists.txt b/solstice/src/CMakeLists.txt index 5ea3b3c6..e6798619 100644 --- a/solstice/src/CMakeLists.txt +++ b/solstice/src/CMakeLists.txt @@ -45,8 +45,8 @@ ${LEFDEF_LIBRARIES} ${OA_LIBRARIES} ) - install ( TARGETS solstice DESTINATION /lib) + install ( TARGETS solstice DESTINATION lib) install ( FILES ${includes} - ${mocIncludes} DESTINATION /include/coriolis/solstice ) + ${mocIncludes} DESTINATION include/coriolis/solstice )