From f8d79dc53e61f487fb5e8974c2b01d233322a1ce Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 16 May 2010 16:33:58 +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. --- hurricane/cmake_modules/CMakeLists.txt | 2 +- hurricane/doc/hurricane/CMakeLists.txt | 4 ++-- hurricane/doc/viewer/CMakeLists.txt | 4 ++-- hurricane/src/hurricane/CMakeLists.txt | 4 ++-- hurricane/src/isobar/CMakeLists.txt | 4 ++-- hurricane/src/viewer/CMakeLists.txt | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hurricane/cmake_modules/CMakeLists.txt b/hurricane/cmake_modules/CMakeLists.txt index 759fa0ae..00bab25f 100644 --- a/hurricane/cmake_modules/CMakeLists.txt +++ b/hurricane/cmake_modules/CMakeLists.txt @@ -1,2 +1,2 @@ install(FILES FindHURRICANE.cmake FindBISON.cmake FindFLEX.cmake - DESTINATION /share/cmake_modules) + DESTINATION share/cmake_modules) diff --git a/hurricane/doc/hurricane/CMakeLists.txt b/hurricane/doc/hurricane/CMakeLists.txt index f4ab0463..00890b5a 100644 --- a/hurricane/doc/hurricane/CMakeLists.txt +++ b/hurricane/doc/hurricane/CMakeLists.txt @@ -1,6 +1,6 @@ - set ( htmlInstallDir /share/doc/en/html/hurricane ) - set ( latexInstallDir /share/doc/en/latex/hurricane ) + set ( htmlInstallDir share/doc/en/html/hurricane ) + set ( latexInstallDir share/doc/en/latex/hurricane ) add_custom_target ( doc ALL cd ${HURRICANE_SOURCE_DIR}/doc/hurricane && ${DOXYGEN_EXECUTABLE} doxyfile ) diff --git a/hurricane/doc/viewer/CMakeLists.txt b/hurricane/doc/viewer/CMakeLists.txt index fdc3e63c..689d239d 100644 --- a/hurricane/doc/viewer/CMakeLists.txt +++ b/hurricane/doc/viewer/CMakeLists.txt @@ -1,6 +1,6 @@ - set ( htmlInstallDir /share/doc/en/html/viewer ) - set ( latexInstallDir /share/doc/en/latex/viewer ) + set ( htmlInstallDir share/doc/en/html/viewer ) + set ( latexInstallDir share/doc/en/latex/viewer ) add_custom_target ( documentation ALL cd ${HURRICANE_SOURCE_DIR}/doc/viewer && ${DOXYGEN_EXECUTABLE} doxyfile ) diff --git a/hurricane/src/hurricane/CMakeLists.txt b/hurricane/src/hurricane/CMakeLists.txt index 93937242..8d90386f 100644 --- a/hurricane/src/hurricane/CMakeLists.txt +++ b/hurricane/src/hurricane/CMakeLists.txt @@ -151,5 +151,5 @@ ) add_library ( hurricane ${cpps} ) - install ( TARGETS hurricane DESTINATION /lib) - install ( FILES ${includes} DESTINATION /include/hurricane ) + install ( TARGETS hurricane DESTINATION lib) + install ( FILES ${includes} DESTINATION include/hurricane ) diff --git a/hurricane/src/isobar/CMakeLists.txt b/hurricane/src/isobar/CMakeLists.txt index ec613638..d4b27775 100644 --- a/hurricane/src/isobar/CMakeLists.txt +++ b/hurricane/src/isobar/CMakeLists.txt @@ -92,5 +92,5 @@ ) target_link_libraries ( Hurricane isobar hurricane ${PYTHON_LIBRARIES} ) - install ( TARGETS isobar DESTINATION /lib ) - install ( TARGETS Hurricane DESTINATION /lib/python ) + install ( TARGETS isobar DESTINATION lib ) + install ( TARGETS Hurricane DESTINATION lib/python ) diff --git a/hurricane/src/viewer/CMakeLists.txt b/hurricane/src/viewer/CMakeLists.txt index 4dd436ed..ea9bf384 100644 --- a/hurricane/src/viewer/CMakeLists.txt +++ b/hurricane/src/viewer/CMakeLists.txt @@ -109,11 +109,11 @@ qt4_wrap_cpp ( MOC_SRCS ${mocincludes} ) qt4_add_resources ( RCC_SRCS CellViewer.qrc ) - install ( FILES ${exports} DESTINATION /include/hurricane/viewer ) + install ( FILES ${exports} DESTINATION include/hurricane/viewer ) add_library ( viewer ${cpps} ${MOC_SRCS} ${RCC_SRCS} ) target_link_libraries ( viewer hurricane ${QT_LIBRARIES} # ${Boost_LIBRARIES} ) - install ( TARGETS viewer DESTINATION /lib ) + install ( TARGETS viewer DESTINATION lib )