From d6f2a2ea222da28e87a181f7eecd321b4c654121 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 16 May 2010 16:34:14 +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. --- equinox/cmake_modules/CMakeLists.txt | 2 +- equinox/src/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/equinox/cmake_modules/CMakeLists.txt b/equinox/cmake_modules/CMakeLists.txt index 3bd7a7ec..09514ab4 100644 --- a/equinox/cmake_modules/CMakeLists.txt +++ b/equinox/cmake_modules/CMakeLists.txt @@ -1 +1 @@ -install ( FILES FindEQUINOX.cmake DESTINATION /share/cmake_modules ) +install ( FILES FindEQUINOX.cmake DESTINATION share/cmake_modules ) diff --git a/equinox/src/CMakeLists.txt b/equinox/src/CMakeLists.txt index fb4aac51..7134150b 100644 --- a/equinox/src/CMakeLists.txt +++ b/equinox/src/CMakeLists.txt @@ -47,9 +47,9 @@ add_library (intervalTree ${intervalTreeCpps} ) target_link_libraries (intervalTree ${CORIOLIS_LIBRARIES} ${HURRICANE_LIBRARIES} ) - install ( TARGETS equinox intervalTree DESTINATION /lib) + install ( TARGETS equinox intervalTree DESTINATION lib) install ( FILES ${includes} ${mocIncludes} - ${intervalTreeIncludes} DESTINATION /include/coriolis/equinox ) + ${intervalTreeIncludes} DESTINATION include/coriolis/equinox )