From 48d1487d7b6192271de62094881ee1e51460c086 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 16 May 2010 16:34:11 +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. --- kite/cmake_modules/CMakeLists.txt | 2 +- kite/doc/CMakeLists.txt | 4 ++-- kite/src/CMakeLists.txt | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kite/cmake_modules/CMakeLists.txt b/kite/cmake_modules/CMakeLists.txt index 0cb75c1c..4825d1b1 100644 --- a/kite/cmake_modules/CMakeLists.txt +++ b/kite/cmake_modules/CMakeLists.txt @@ -1 +1 @@ -install ( FILES FindKITE.cmake DESTINATION /share/cmake_modules ) +install ( FILES FindKITE.cmake DESTINATION share/cmake_modules ) diff --git a/kite/doc/CMakeLists.txt b/kite/doc/CMakeLists.txt index 7d6870ef..681dd933 100644 --- a/kite/doc/CMakeLists.txt +++ b/kite/doc/CMakeLists.txt @@ -1,6 +1,6 @@ - set ( htmlInstallDir /share/doc/en/html/kite ) - set ( latexInstallDir /share/doc/en/latex/kite ) + set ( htmlInstallDir share/doc/en/html/kite ) + set ( latexInstallDir share/doc/en/latex/kite ) add_custom_target ( doc ALL cd ${KITE_SOURCE_DIR}/doc && ${DOXYGEN_EXECUTABLE} doxyfile ) diff --git a/kite/src/CMakeLists.txt b/kite/src/CMakeLists.txt index a7d8ab81..d138614f 100644 --- a/kite/src/CMakeLists.txt +++ b/kite/src/CMakeLists.txt @@ -95,9 +95,9 @@ ${OA_LIBRARIES} ${Boost_LIBRARIES} ) - install ( TARGETS kite DESTINATION /lib ) - install ( TARGETS kite-text DESTINATION /bin ) + install ( TARGETS kite DESTINATION lib ) + install ( TARGETS kite-text DESTINATION bin ) install ( FILES ${includes} - ${mocIncludes} DESTINATION /include/coriolis/kite ) + ${mocIncludes} DESTINATION include/coriolis/kite )