From 1a874d564a518870780b504769c281ac24c7dd03 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 16 May 2010 16:33:53 +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. --- vlsisapd/agds/CMakeLists.txt | 4 ++-- vlsisapd/cif/CMakeLists.txt | 4 ++-- vlsisapd/cmake_modules/CMakeLists.txt | 3 +-- vlsisapd/dtr/src/CMakeLists.txt | 6 +++--- vlsisapd/openChams/CMakeLists.txt | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/vlsisapd/agds/CMakeLists.txt b/vlsisapd/agds/CMakeLists.txt index 4688dbc0..2e5c5baa 100644 --- a/vlsisapd/agds/CMakeLists.txt +++ b/vlsisapd/agds/CMakeLists.txt @@ -4,6 +4,6 @@ SET ( includes GdsLibrary.h GdsStructure.h GdsElement.h GdsRectangle.h ) SET ( cpps GdsLibrary.cpp GdsStructure.cpp GdsRectangle.cpp ) ADD_LIBRARY(agds ${cpps}) -INSTALL(TARGETS agds DESTINATION /lib) +INSTALL(TARGETS agds DESTINATION lib) -INSTALL(FILES ${includes} DESTINATION /include/io/agds) +INSTALL(FILES ${includes} DESTINATION include/io/agds) diff --git a/vlsisapd/cif/CMakeLists.txt b/vlsisapd/cif/CMakeLists.txt index 69fcf807..988f1501 100644 --- a/vlsisapd/cif/CMakeLists.txt +++ b/vlsisapd/cif/CMakeLists.txt @@ -4,6 +4,6 @@ SET ( includes CifCircuit.h CifPolygon.h ) SET ( cpps CifCircuit.cpp CifPolygon.cpp ) ADD_LIBRARY(cif ${cpps}) -INSTALL(TARGETS cif DESTINATION /lib) +INSTALL(TARGETS cif DESTINATION lib) -INSTALL(FILES ${includes} DESTINATION /include/io/cif) +INSTALL(FILES ${includes} DESTINATION include/io/cif) diff --git a/vlsisapd/cmake_modules/CMakeLists.txt b/vlsisapd/cmake_modules/CMakeLists.txt index 9257ab4c..eab771c6 100644 --- a/vlsisapd/cmake_modules/CMakeLists.txt +++ b/vlsisapd/cmake_modules/CMakeLists.txt @@ -1,2 +1 @@ -install(FILES FindIO.cmake - DESTINATION /share/cmake_modules) +install(FILES FindIO.cmake DESTINATION share/cmake_modules) diff --git a/vlsisapd/dtr/src/CMakeLists.txt b/vlsisapd/dtr/src/CMakeLists.txt index ef734a22..044c8522 100644 --- a/vlsisapd/dtr/src/CMakeLists.txt +++ b/vlsisapd/dtr/src/CMakeLists.txt @@ -21,7 +21,7 @@ SET ( pycpps PyTechno.cpp ${cpps}) ADD_LIBRARY(dtr ${cpps}) TARGET_LINK_LIBRARIES(dtr ${LIBXML2_LIBRARIES}) -INSTALL(TARGETS dtr DESTINATION /lib) +INSTALL(TARGETS dtr DESTINATION lib) IF (Boost_FOUND) ADD_LIBRARY(pyDTR MODULE ${pycpps}) @@ -30,7 +30,7 @@ SET_TARGET_PROPERTIES(pyDTR PROPERTIES PREFIX "" ) TARGET_LINK_LIBRARIES(pyDTR dtr ${LIBXML2_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) -INSTALL(TARGETS pyDTR DESTINATION /lib/python) +INSTALL(TARGETS pyDTR DESTINATION lib/python) ENDIF(Boost_FOUND) -INSTALL(FILES ${hpps} DESTINATION /include/io/dtr) +INSTALL(FILES ${hpps} DESTINATION include/io/dtr) diff --git a/vlsisapd/openChams/CMakeLists.txt b/vlsisapd/openChams/CMakeLists.txt index 148e9e6b..e5f89b12 100644 --- a/vlsisapd/openChams/CMakeLists.txt +++ b/vlsisapd/openChams/CMakeLists.txt @@ -28,6 +28,6 @@ ADD_LIBRARY(openChams ${cpps}) TARGET_LINK_LIBRARIES(openChams ${LIBXML2_LIBRARIES}) -INSTALL(TARGETS openChams DESTINATION /lib) +INSTALL(TARGETS openChams DESTINATION lib) -INSTALL(FILES ${includes} DESTINATION /include/io/openChams) +INSTALL(FILES ${includes} DESTINATION include/io/openChams)