jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* 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.
This commit is contained in:
Jean-Paul Chaput 2010-05-16 16:33:53 +00:00
parent 4fcd26a6bf
commit 1a874d564a
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vlsisapd/agds/CMakeLists.txt
View File

@ -4,6 +4,6 @@ SET ( includes GdsLibrary.h GdsStructure.h GdsElement.h GdsRectangle.h )
SET ( cpps GdsLibrary.cpp GdsStructure.cpp GdsRectangle.cpp ) SET ( cpps GdsLibrary.cpp GdsStructure.cpp GdsRectangle.cpp )
ADD_LIBRARY(agds ${cpps}) 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)

4
vlsisapd/cif/CMakeLists.txt
View File

@ -4,6 +4,6 @@ SET ( includes CifCircuit.h CifPolygon.h )
SET ( cpps CifCircuit.cpp CifPolygon.cpp ) SET ( cpps CifCircuit.cpp CifPolygon.cpp )
ADD_LIBRARY(cif ${cpps}) 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)

3
vlsisapd/cmake_modules/CMakeLists.txt
View File

@ -1,2 +1 @@
install(FILES FindIO.cmake install(FILES FindIO.cmake DESTINATION share/cmake_modules)
DESTINATION /share/cmake_modules)

6
vlsisapd/dtr/src/CMakeLists.txt
View File

@ -21,7 +21,7 @@ SET ( pycpps PyTechno.cpp ${cpps})
ADD_LIBRARY(dtr ${cpps}) ADD_LIBRARY(dtr ${cpps})
TARGET_LINK_LIBRARIES(dtr ${LIBXML2_LIBRARIES}) TARGET_LINK_LIBRARIES(dtr ${LIBXML2_LIBRARIES})
INSTALL(TARGETS dtr DESTINATION /lib) INSTALL(TARGETS dtr DESTINATION lib)
IF (Boost_FOUND) IF (Boost_FOUND)
ADD_LIBRARY(pyDTR MODULE ${pycpps}) ADD_LIBRARY(pyDTR MODULE ${pycpps})
@ -30,7 +30,7 @@ SET_TARGET_PROPERTIES(pyDTR PROPERTIES
PREFIX "" PREFIX ""
) )
TARGET_LINK_LIBRARIES(pyDTR dtr ${LIBXML2_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) 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) ENDIF(Boost_FOUND)
INSTALL(FILES ${hpps} DESTINATION /include/io/dtr) INSTALL(FILES ${hpps} DESTINATION include/io/dtr)

4
vlsisapd/openChams/CMakeLists.txt
View File

@ -28,6 +28,6 @@ ADD_LIBRARY(openChams ${cpps})
TARGET_LINK_LIBRARIES(openChams ${LIBXML2_LIBRARIES}) 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)