From 53e9b7154d5da9b37dc62c3b3186b29c66784cf5 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 16 May 2010 16:34:20 +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. --- unicorn/cmake_modules/CMakeLists.txt | 2 +- unicorn/src/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/unicorn/cmake_modules/CMakeLists.txt b/unicorn/cmake_modules/CMakeLists.txt index 738728ca..70512c10 100644 --- a/unicorn/cmake_modules/CMakeLists.txt +++ b/unicorn/cmake_modules/CMakeLists.txt @@ -1 +1 @@ -install ( FILES FindUNICORN.cmake DESTINATION /share/cmake_modules ) +install ( FILES FindUNICORN.cmake DESTINATION share/cmake_modules ) diff --git a/unicorn/src/CMakeLists.txt b/unicorn/src/CMakeLists.txt index 394e9d1d..54b4cbc4 100644 --- a/unicorn/src/CMakeLists.txt +++ b/unicorn/src/CMakeLists.txt @@ -58,8 +58,8 @@ ${QT_LIBRARIES} ${Boost_LIBRARIES} ) - install ( TARGETS unicorn DESTINATION /lib) - install ( TARGETS cgt DESTINATION /bin ) + install ( TARGETS unicorn DESTINATION lib ) + install ( TARGETS cgt DESTINATION bin ) install ( FILES ${includes} - ${mocIncludes} DESTINATION /include/coriolis/unicorn ) + ${mocIncludes} DESTINATION include/coriolis/unicorn )