From c61f191a619cf032fddeb82c40a7486053860e59 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 16 May 2010 16:34:02 +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. --- crlcore/cmake_modules/CMakeLists.txt | 2 +- crlcore/etc/CMakeLists.txt | 14 +++++++------- crlcore/src/ccore/CMakeLists.txt | 4 ++-- crlcore/src/cyclop/CMakeLists.txt | 2 +- crlcore/src/x2y/CMakeLists.txt | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/crlcore/cmake_modules/CMakeLists.txt b/crlcore/cmake_modules/CMakeLists.txt index 17d7251d..c9334541 100644 --- a/crlcore/cmake_modules/CMakeLists.txt +++ b/crlcore/cmake_modules/CMakeLists.txt @@ -1,4 +1,4 @@ install ( FILES FindCORIOLIS.cmake FindOPENACCESS.cmake FindLEFDEF.cmake - DESTINATION /share/cmake_modules ) + DESTINATION share/cmake_modules ) diff --git a/crlcore/etc/CMakeLists.txt b/crlcore/etc/CMakeLists.txt index dc8a475c..03d2df7e 100644 --- a/crlcore/etc/CMakeLists.txt +++ b/crlcore/etc/CMakeLists.txt @@ -1,7 +1,7 @@ - install ( FILES environment.alliance.xml DESTINATION /share/etc ) - install ( FILES technology.symbolic.xml DESTINATION /share/etc ) - install ( FILES technology.hcmos9.s2r.xml DESTINATION /share/etc ) - install ( FILES technology.cmos065.s2r.xml DESTINATION /share/etc ) - install ( FILES technology.freePDK45.s2r.xml DESTINATION /share/etc ) - install ( FILES technology.fake.s2r.xml DESTINATION /share/etc ) - install ( FILES display.xml DESTINATION /share/etc ) + install ( FILES environment.alliance.xml DESTINATION share/etc ) + install ( FILES technology.symbolic.xml DESTINATION share/etc ) + install ( FILES technology.hcmos9.s2r.xml DESTINATION share/etc ) + install ( FILES technology.cmos065.s2r.xml DESTINATION share/etc ) + install ( FILES technology.freePDK45.s2r.xml DESTINATION share/etc ) + install ( FILES technology.fake.s2r.xml DESTINATION share/etc ) + install ( FILES display.xml DESTINATION share/etc ) diff --git a/crlcore/src/ccore/CMakeLists.txt b/crlcore/src/ccore/CMakeLists.txt index 85ababb3..7abacff5 100644 --- a/crlcore/src/ccore/CMakeLists.txt +++ b/crlcore/src/ccore/CMakeLists.txt @@ -209,7 +209,7 @@ qt4_wrap_cpp ( moc_cpps ${mocincludes} ) - install ( FILES ${includes} ${mocincludes} DESTINATION /include/coriolis/crlcore ) + install ( FILES ${includes} ${mocincludes} DESTINATION include/coriolis/crlcore ) add_library ( crlcore ${ccore_cpps} ${moc_cpps} @@ -237,4 +237,4 @@ ${AGDS_LIBRARY} ${CIF_LIBRARY} ) - install ( TARGETS crlcore DESTINATION /lib ) + install ( TARGETS crlcore DESTINATION lib ) diff --git a/crlcore/src/cyclop/CMakeLists.txt b/crlcore/src/cyclop/CMakeLists.txt index ed210380..811fc20c 100644 --- a/crlcore/src/cyclop/CMakeLists.txt +++ b/crlcore/src/cyclop/CMakeLists.txt @@ -26,5 +26,5 @@ ${OA_LIBRARIES} ${QT_LIBRARIES} ${Boost_LIBRARIES} ) - install ( TARGETS cyclop DESTINATION /bin ) + install ( TARGETS cyclop DESTINATION bin ) diff --git a/crlcore/src/x2y/CMakeLists.txt b/crlcore/src/x2y/CMakeLists.txt index 3af1946d..6361e5a8 100644 --- a/crlcore/src/x2y/CMakeLists.txt +++ b/crlcore/src/x2y/CMakeLists.txt @@ -16,4 +16,4 @@ ${OA_LIBRARIES} ${QT_LIBRARIES} ${Boost_LIBRARIES} ) - install ( TARGETS cx2y DESTINATION /bin ) + install ( TARGETS cx2y DESTINATION bin )